* merged from main

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index da1f21e6ce90d6db3bb86b1a7d5fbd7b710c1db4..53600fb61acc32a4755528fc945901aea7729481 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -23,11 +23,9 @@
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/packagemanager.h"
-#endif

 
 #include <string>
 
 #include <string>

+#include <iostream>

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


@@ -82,12 +80,7 @@ class pkgPackageManager : protected pkgCache::Namespace
                    pkgRecords *Recs);
 
    // Do the installation 
                    pkgRecords *Recs);
 
    // Do the installation 

-   OrderResult DoInstall() {
-      if(DoInstallPreFork() == Failed)
-        return Failed;
-
-      return DoInstallPostFork();
-   }
+   OrderResult DoInstall(int statusFd=-1);

 
    // stuff that needs to be done before the fork() of a library that
    // uses apt
 
    // stuff that needs to be done before the fork() of a library that
    // uses apt


@@ -101,11 +94,11 @@ class pkgPackageManager : protected pkgCache::Namespace
       bool goResult = Go(statusFd);
       if(goResult == false) 
         return Failed;
       bool goResult = Go(statusFd);
       if(goResult == false) 
         return Failed;

-      
+

       // if all was fine update the state file
       // if all was fine update the state file

-      if(Res == Completed)
+      if(Res == Completed) {

         Cache.writeStateFile(NULL);
         Cache.writeStateFile(NULL);

-
+      }

       return Res;
    };
 
       return Res;
    };