* merged changes from Kamions upload (thanks!)

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 05615db79a2b02751824e952578b529863e4e154..b0dd43629c8c8ff9bfa75d17742f17aec6a3af44 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -593,7 +593,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
          Pkg.State() == pkgCache::PkgIterator::NeedsNothing &&
          (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
       {
          Pkg.State() == pkgCache::PkgIterator::NeedsNothing &&
          (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
       {

-        _error->Error("Internal Error, trying to manipulate a kept package");
+        _error->Error("Internal Error, trying to manipulate a kept package (%s)",Pkg.Name());

         return Failed;
       }
       
         return Failed;
       }
       


@@ -636,6 +636,6 @@ pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd)
    if(DoInstallPreFork() == Failed)
       return Failed;
    
    if(DoInstallPreFork() == Failed)
       return Failed;
    

-   return DoInstallPostFork();
+   return DoInstallPostFork(statusFd);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/