* starmeged with matt, added some comments to the unsetting of no_proxy in ftp.cc

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 6020cbefdbca892569525f8a757645a9112fd6de..43f2c4acea2429b8cf45cba0f7681eb0c31421a6 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: packagemanager.h,v 1.1 1998/07/07 04:17:01 jgg Exp $
+// $Id: packagemanager.h,v 1.14 2001/05/07 04:24:08 jgg Exp $

 /* ######################################################################
 
    Package Manager - Abstacts the package manager
 /* ######################################################################
 
    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
    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
    
    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,39 +20,39 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
 #ifdef __GNUG__
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
 #ifdef __GNUG__

-#pragma interface "pkglib/packagemanager.h"
+#pragma interface "apt-pkg/packagemanager.h"

 #endif
 
 #include <string>
 #endif
 
 #include <string>

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

 
 

-class pkgAquire;
+using std::string;
+
+class pkgAcquire;

 class pkgDepCache;
 class pkgSourceList;
 class pkgOrderList;
 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;
    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 DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);

-   bool OrderInstall();
+   virtual OrderResult OrderInstall();

    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);
    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);

+   bool CreateOrderList();

    
    // Analysis helpers
    bool DepAlwaysTrue(DepIterator D);
    
    // Analysis helpers
    bool DepAlwaysTrue(DepIterator D);


@@ -64,20 +64,22 @@ class pkgPackageManager
    bool SmartRemove(PkgIterator Pkg);
    bool EarlyRemove(PkgIterator Pkg);   
    
    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 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(int statusFd=-1) {return true;};
+   virtual void Reset() {};

    
    public:
    
    public:

-
-   // The three stages
-   bool GetArchives(pkgSourceList &List,pkgAquire &Engine);
-   bool DoInstall();
+      
+   // Main action members
+   bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
+                   pkgRecords *Recs);
+   OrderResult DoInstall();

    bool FixMissing();
    
    bool FixMissing();
    

-   pkgPackageManager(pkgDepCache &Cache);
+   pkgPackageManager(pkgDepCache *Cache);

    virtual ~pkgPackageManager();
 };
 
    virtual ~pkgPackageManager();
 };