* merged with apt@packages.debian.org/apt--main--0

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 454e90f..f64637d 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.12 2001/03/11 07:35:49 jgg Exp $
+// $Id: packagemanager.h,v 1.14 2001/05/07 04:24:08 jgg Exp $
 /* ######################################################################
 
    Package Manager - Abstacts the package manager
@@ -30,6 +30,8 @@
 #include <string>
 #include <apt-pkg/pkgcache.h>
 
+using std::string;
+
 class pkgAcquire;
 class pkgDepCache;
 class pkgSourceList;
@@ -48,7 +50,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    bool Debug;
          
    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();
    
@@ -66,7 +68,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    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:
@@ -74,7 +76,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    // Main action members
    bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
                    pkgRecords *Recs);
-   OrderResult DoInstall();
+   OrderResult DoInstall(int statusFd=-1); 
    bool FixMissing();
    
    pkgPackageManager(pkgDepCache *Cache);