* merged apt--curl-https branch

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index f95b2ab560f4a3a97f42291f1b4da34524fabf4b..53600fb61acc32a4755528fc945901aea7729481 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -23,9 +23,6 @@
 #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 <iostream>
 
 #include <string>
 #include <iostream>


@@ -83,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