test Release file handling with expired keys

[apt.git] / apt-pkg / algorithms.h

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 37eacf1f8d77b94b7fbcdb8ef8ecf1c53c73ba03..7f58c8eedb12ce281d8af8df120eeda3be6d3013 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -36,6 +36,8 @@
 
 #include <iostream>
 
 
 #include <iostream>
 

+#include <apt-pkg/macros.h>
+

 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/acquire.h>
 using std::ostream;
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/acquire.h>
 using std::ostream;


@@ -78,6 +80,7 @@ private:
    public:
 
    pkgSimulate(pkgDepCache *Cache);
    public:
 
    pkgSimulate(pkgDepCache *Cache);

+   ~pkgSimulate();

 };
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/
 };
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/


@@ -131,9 +134,8 @@ class pkgProblemResolver                                            /*{{{*/
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
 
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
 

-   // Install all protected packages   
-   void InstallProtect();   
-   
+   __deprecated void InstallProtect();
+

    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();
 };
    pkgProblemResolver(pkgDepCache *Cache);
    ~pkgProblemResolver();
 };


@@ -147,5 +149,7 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 
 bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0);
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 
 bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0);

-                    
+bool AcquireUpdate(pkgAcquire &Fetcher, int const PulseInterval = 0,
+                  bool const RunUpdateScripts = true, bool const ListCleanup = true);
+

 #endif
 #endif