Rename FileFd::Open() Perms to AccessMode

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 96dc5f236cd007dcb521e1258ca968aaea1736b2..344ed9192aff5936805421f90f35cc1e5666d573 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -23,20 +23,29 @@
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
 #ifndef PKGLIB_PACKAGEMANAGER_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 <apt-pkg/pkgcache.h>
-#include <apt-pkg/depcache.h>

 #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;
 using std::string;

+#endif

 
 class pkgAcquire;
 class pkgDepCache;
 class pkgSourceList;
 class pkgOrderList;
 class pkgRecords;
 
 class pkgAcquire;
 class pkgDepCache;
 class pkgSourceList;
 class pkgOrderList;
 class pkgRecords;

+
+

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


@@ -45,7 +54,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    static bool SigINTStop;
    
    protected:
    static bool SigINTStop;
    
    protected:

-   string *FileNames;
+   std::string *FileNames;

    pkgDepCache &Cache;
    pkgOrderList *List;
    bool Debug;
    pkgDepCache &Cache;
    pkgOrderList *List;
    bool Debug;


@@ -66,7 +75,7 @@ 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();


@@ -78,10 +87,15 @@ class pkgPackageManager : protected pkgCache::Namespace
    bool EarlyRemove(PkgIterator Pkg);  
    
    // The Actual installation implementation
    bool EarlyRemove(PkgIterator Pkg);  
    
    // The Actual installation implementation

-   virtual bool Install(PkgIterator /*Pkg*/,string /*File*/) {return false;};
+   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 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


@@ -94,7 +108,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


@@ -102,9 +122,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 */