* merged with mainline

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index e46f8808b34397506b7c69ffb92846c517495342..48f53576cf981517abd93f20be92a01e9ad686cf 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.11 2001/02/20 07:03:17 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


@@ -28,7 +28,11 @@
 #endif
 
 #include <string>
 #endif
 
 #include <string>

+#include <iostream>

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

+#include <apt-pkg/depcache.h>
+
+using std::string;

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


@@ -48,7 +52,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    bool Debug;
          
    bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);
    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();
    
    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);
    bool CreateOrderList();
    


@@ -63,18 +67,44 @@ class pkgPackageManager : protected pkgCache::Namespace
    bool EarlyRemove(PkgIterator Pkg);   
    
    // The Actual installation implementation
    bool EarlyRemove(PkgIterator Pkg);   
    
    // 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 Go() {return true;};
+   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(int statusFd=-1) {return true;};

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

-   
+
+   // the result of the operation
+   OrderResult Res;
+

    public:
       
    // Main action members
    bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
                    pkgRecords *Recs);
    public:
       
    // Main action members
    bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
                    pkgRecords *Recs);

-   OrderResult DoInstall();
+
+   // Do the installation 
+   OrderResult DoInstall(int statusFd=-1);
+
+   // stuff that needs to be done before the fork() of a library that
+   // uses apt
+   OrderResult DoInstallPreFork() {
+      Res = OrderInstall();
+      return Res;
+   };
+
+   // stuff that needs to be done after the fork
+   OrderResult DoInstallPostFork(int statusFd=-1) {
+      bool goResult = Go(statusFd);
+      if(goResult == false) 
+        return Failed;
+
+      // if all was fine update the state file
+      if(Res == Completed) {
+        Cache.writeStateFile(NULL);
+      }
+      return Res;
+   };
+

    bool FixMissing();
    
    pkgPackageManager(pkgDepCache *Cache);
    bool FixMissing();
    
    pkgPackageManager(pkgDepCache *Cache);