* merged with the apt--improved-do-install patch

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--improved-do-install--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-88

 * michael.vogt@ubuntu.com--2005/apt--improved-do-install--0--patch-1
   * merged with apt--fixes to make it build

 * michael.vogt@ubuntu.com--2005/apt--improved-do-install--0--patch-2
   * added "DoInstall{Pre,Post}Fork()"

1 files changed, 34 insertions, 2 deletions

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 43f2c4ace..da1f21e6c 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -29,6 +29,7 @@
 
 #include <string>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/depcache.h>
 
 using std::string;
 
@@ -70,13 +71,44 @@ class pkgPackageManager : protected pkgCache::Namespace
    virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
    virtual bool Go(int statusFd=-1) {return true;};
    virtual void Reset() {};
-   
+
+   // the result of the operation
+   OrderResult Res;
+
    public:
       
    // Main action members
    bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
 		    pkgRecords *Recs);
-   OrderResult DoInstall();
+
+   // Do the installation 
+   OrderResult DoInstall() {
+      if(DoInstallPreFork() == Failed)
+	 return Failed;
+
+      return DoInstallPostFork();
+   }
+
+   // 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);