add #ifdefed ABI break & cleaner solution once the abi break is in place

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 1a6a9f01c7ad0bbfcb06484f2ce82d8d9b064627..853b9bac8c9f9b0878d7285ae3bb143eb3c37470 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -23,7 +23,10 @@
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 

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

 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/pkgcache.h>

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

 
 #include <string>
 #include <iostream>
 
 #include <string>
 #include <iostream>


@@ -39,6 +42,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:


@@ -83,7 +88,12 @@ class pkgPackageManager : protected pkgCache::Namespace
    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 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;};

+#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;};
    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 +106,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
+   __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 +120,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
+   __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 */