Merge bzip2-debs branch

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index a097712a368e0928126c6da1e4edf02926e8eb86..ba84c5ed78d47ca14c96bb05fab584edae0b3fb1 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: packagemanager.h,v 1.3 1998/07/12 23:58:31 jgg Exp $
+// $Id: packagemanager.h,v 1.14 2001/05/07 04:24:08 jgg Exp $
 /* ######################################################################
 
    Package Manager - Abstacts the package manager
@@ -8,7 +8,7 @@
    Three steps are 
      - Aquiration of archives (stores the list of final file names)
      - Sorting of operations
-     - Inokation of package manager
+     - Invokation of package manager
    
    This is the final stage when the package cache entities get converted
    into file names and the state stored in a DepCache is transformed
@@ -20,7 +20,6 @@
    
    ##################################################################### */
                                                                        /*}}}*/
-// Header section: pkglib
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
@@ -31,28 +30,29 @@
 #include <string>
 #include <apt-pkg/pkgcache.h>
 
-class pkgAquire;
+using std::string;
+
+class pkgAcquire;
 class pkgDepCache;
 class pkgSourceList;
 class pkgOrderList;
-class pkgPackageManager
+class pkgRecords;
+class pkgPackageManager : protected pkgCache::Namespace
 {
+   public:
+   
+   enum OrderResult {Completed,Failed,Incomplete};
+   
    protected:
    string *FileNames;
    pkgDepCache &Cache;
    pkgOrderList *List;
-   
-   // Bring some usefull types into the local scope
-   typedef pkgCache::PkgIterator PkgIterator;
-   typedef pkgCache::VerIterator VerIterator;
-   typedef pkgCache::DepIterator DepIterator;
-   typedef pkgCache::PrvIterator PrvIterator;
-   typedef pkgCache::Version Version;
-   typedef pkgCache::Package Package;
-      
+   bool Debug;
+         
    bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);
-   bool OrderInstall();
+   virtual OrderResult OrderInstall();
    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);
+   bool CreateOrderList();
    
    // Analysis helpers
    bool DepAlwaysTrue(DepIterator D);
@@ -64,19 +64,22 @@ class pkgPackageManager
    bool SmartRemove(PkgIterator Pkg);
    bool EarlyRemove(PkgIterator Pkg);   
    
-   // The Actuall installation implementation
+   // The Actual installation implementation
    virtual bool Install(PkgIterator /*Pkg*/,string /*File*/) {return false;};
    virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
-   virtual bool Remove(PkgIterator /*Pkg*/) {return false;};
-   virtual bool Go() {return false;};
+   virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
+   virtual bool Go() {return true;};
+   virtual void Reset() {};
    
    public:
-
+      
    // Main action members
-   bool DoInstall();
+   bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
+                   pkgRecords *Recs);
+   OrderResult DoInstall();
    bool FixMissing();
    
-   pkgPackageManager(pkgDepCache &Cache);
+   pkgPackageManager(pkgDepCache *Cache);
    virtual ~pkgPackageManager();
 };