Merge remote-tracking branch 'mvo/bugfix/apt-get-source-unauthenticated-warning'...

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 1a6a9f01c7ad0bbfcb06484f2ce82d8d9b064627..d72790b6ec01cf1c2ad229059d4f0a8c053320a9 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -24,11 +24,16 @@
 #define PKGLIB_PACKAGEMANAGER_H
 
 #include <apt-pkg/pkgcache.h>
 #define PKGLIB_PACKAGEMANAGER_H
 
 #include <apt-pkg/pkgcache.h>

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

 
 #include <string>
 
 #include <string>

-#include <iostream>

 #include <set>
 
 #include <set>
 

+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/install-progress.h>
+#include <iostream>
+#endif

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


@@ -39,6 +44,8 @@ class pkgDepCache;
 class pkgSourceList;
 class pkgOrderList;
 class pkgRecords;
 class pkgSourceList;
 class pkgOrderList;
 class pkgRecords;

+
+

 class pkgPackageManager : protected pkgCache::Namespace
 {
    public:
 class pkgPackageManager : protected pkgCache::Namespace
 {
    public:


@@ -68,22 +75,28 @@ class pkgPackageManager : protected pkgCache::Namespace
    bool CreateOrderList();
    
    // Analysis helpers
    bool CreateOrderList();
    
    // Analysis helpers

-   bool DepAlwaysTrue(DepIterator D);
+   bool DepAlwaysTrue(DepIterator D) APT_PURE;

    
    // Install helpers
    bool ConfigureAll();
    
    // Install helpers
    bool ConfigureAll();

-   bool SmartConfigure(PkgIterator Pkg, int const Depth);
+   bool SmartConfigure(PkgIterator Pkg, int const Depth) APT_MUSTCHECK;

    //FIXME: merge on abi break
    //FIXME: merge on abi break

-   bool SmartUnPack(PkgIterator Pkg);
-   bool SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth);
-   bool SmartRemove(PkgIterator Pkg);
-   bool EarlyRemove(PkgIterator Pkg);  
-   
+   bool SmartUnPack(PkgIterator Pkg) APT_MUSTCHECK;
+   bool SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth) APT_MUSTCHECK;
+   bool SmartRemove(PkgIterator Pkg) APT_MUSTCHECK;
+   bool EarlyRemove(PkgIterator Pkg, DepIterator const * const Dep) APT_MUSTCHECK;
+   APT_DEPRECATED bool EarlyRemove(PkgIterator Pkg) APT_MUSTCHECK;
+

    // The Actual installation implementation
    virtual bool Install(PkgIterator /*Pkg*/,std::string /*File*/) {return false;};
    virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
    virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
    // The Actual installation implementation
    virtual bool Install(PkgIterator /*Pkg*/,std::string /*File*/) {return false;};
    virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
    virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};

-   virtual bool Go(int statusFd=-1) {return true;};
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+   virtual bool Go(APT::Progress::PackageManager * /*progress*/) {return true;};
+#else
+   virtual bool Go(int /*statusFd*/=-1) {return true;};
+#endif
+

    virtual void Reset() {};
 
    // the result of the operation
    virtual void Reset() {};
 
    // the result of the operation


@@ -96,7 +109,13 @@ class pkgPackageManager : protected pkgCache::Namespace
                    pkgRecords *Recs);
 
    // Do the installation 
                    pkgRecords *Recs);
 
    // Do the installation 

+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+   OrderResult DoInstall(APT::Progress::PackageManager *progress);
+   // compat
+   APT_DEPRECATED OrderResult DoInstall(int statusFd=-1);
+#else

    OrderResult DoInstall(int statusFd=-1);
    OrderResult DoInstall(int statusFd=-1);

+#endif

 
    // stuff that needs to be done before the fork() of a library that
    // uses apt
 
    // stuff that needs to be done before the fork() of a library that
    // uses apt


@@ -104,9 +123,16 @@ class pkgPackageManager : protected pkgCache::Namespace
       Res = OrderInstall();
       return Res;
    };
       Res = OrderInstall();
       return Res;
    };

-
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)

    // stuff that needs to be done after the fork
    // stuff that needs to be done after the fork

+   OrderResult DoInstallPostFork(APT::Progress::PackageManager *progress);
+   // compat
+   APT_DEPRECATED OrderResult DoInstallPostFork(int statusFd=-1);
+#else

    OrderResult DoInstallPostFork(int statusFd=-1);
    OrderResult DoInstallPostFork(int statusFd=-1);

+#endif
+
+   // ?

    bool FixMissing();
 
    /** \brief returns all packages dpkg let disappear */
    bool FixMissing();
 
    /** \brief returns all packages dpkg let disappear */


@@ -114,6 +140,12 @@ class pkgPackageManager : protected pkgCache::Namespace
 
    pkgPackageManager(pkgDepCache *Cache);
    virtual ~pkgPackageManager();
 
    pkgPackageManager(pkgDepCache *Cache);
    virtual ~pkgPackageManager();

+
+   private:
+   enum APT_HIDDEN SmartAction { UNPACK_IMMEDIATE, UNPACK, CONFIGURE };
+   APT_HIDDEN bool NonLoopingSmart(SmartAction const action, pkgCache::PkgIterator &Pkg,
+      pkgCache::PkgIterator DepPkg, int const Depth, bool const PkgLoop,
+      bool * const Bad, bool * const Changed) APT_MUSTCHECK;

 };
 
 #endif
 };
 
 #endif