merge with my debian-sid branch

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index efd2cfac6ad18004efab7c51a2a9bb871a0c110a..d4989a6e04e3ef4ad6e11163a697c427571e1b07 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -23,15 +23,12 @@
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 

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

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

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

 #include <set>
 
 #include <set>
 

-using std::string;
-

 class pkgAcquire;
 class pkgDepCache;
 class pkgSourceList;
 class pkgAcquire;
 class pkgDepCache;
 class pkgSourceList;


@@ -42,12 +39,15 @@ class pkgPackageManager : protected pkgCache::Namespace
    public:
    
    enum OrderResult {Completed,Failed,Incomplete};
    public:
    
    enum OrderResult {Completed,Failed,Incomplete};

+   static bool SigINTStop;

    
    protected:
    
    protected:

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

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

+   bool NoImmConfigure;
+   bool ImmConfigureAll;

 
    /** \brief saves packages dpkg let disappear
 
 
    /** \brief saves packages dpkg let disappear
 


@@ -57,7 +57,6 @@ class pkgPackageManager : protected pkgCache::Namespace
    */
    std::set<std::string> disappearedPkgs;
 
    */
    std::set<std::string> disappearedPkgs;
 

-   bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);

    void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth = 0);
    virtual OrderResult OrderInstall();
    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);
    void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth = 0);
    virtual OrderResult OrderInstall();
    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);


@@ -68,13 +67,15 @@ class pkgPackageManager : protected pkgCache::Namespace
    
    // Install helpers
    bool ConfigureAll();
    
    // Install helpers
    bool ConfigureAll();

-   bool SmartConfigure(PkgIterator Pkg);
+   bool SmartConfigure(PkgIterator Pkg, int const Depth);
+   //FIXME: merge on abi break

    bool SmartUnPack(PkgIterator Pkg);
    bool SmartUnPack(PkgIterator Pkg);

+   bool SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth);

    bool SmartRemove(PkgIterator Pkg);
    bool SmartRemove(PkgIterator Pkg);

-   bool EarlyRemove(PkgIterator Pkg);   
+   bool EarlyRemove(PkgIterator Pkg);  

    
    // The Actual installation implementation
    
    // 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 Go(int statusFd=-1) {return true;};
    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;};