* buildlib/defaults.mak:

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index d8a09f65a361a734e34d1b3cb1da3dc87a23f7eb..f64637d03353ae15c54da0a15a63bb7a88a20718 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.10 1999/07/20 05:53:33 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


@@ -20,7 +20,6 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 


@@ -31,12 +30,14 @@
 #include <string>
 #include <apt-pkg/pkgcache.h>
 
 #include <string>
 #include <apt-pkg/pkgcache.h>
 

+using std::string;
+

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

-class pkgPackageManager
+class pkgPackageManager : protected pkgCache::Namespace

 {
    public:
    
 {
    public:
    


@@ -47,17 +48,9 @@ class pkgPackageManager
    pkgDepCache &Cache;
    pkgOrderList *List;
    bool Debug;
    pkgDepCache &Cache;
    pkgOrderList *List;
    bool Debug;

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

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

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


@@ -71,11 +64,11 @@ 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 Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
    virtual bool Install(PkgIterator /*Pkg*/,string /*File*/) {return false;};
    virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
    virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};

-   virtual bool Go() {return true;};
+   virtual bool Go(int statusFd=-1) {return true;};

    virtual void Reset() {};
    
    public:
    virtual void Reset() {};
    
    public:


@@ -83,10 +76,10 @@ class pkgPackageManager
    // Main action members
    bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
                    pkgRecords *Recs);
    // Main action members
    bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
                    pkgRecords *Recs);

-   OrderResult DoInstall();
+   OrderResult DoInstall(int statusFd=-1); 

    bool FixMissing();
    
    bool FixMissing();
    

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

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