* updated from http://people.ubuntu.com/~mvo/bzr/apt/auto-mark/

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 05615db79a2b02751824e952578b529863e4e154..1e57d645561db47fd6afef95a2cb5757e4135c9e 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -95,9 +95,10 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
    be downloaded. */
 bool pkgPackageManager::FixMissing()
 {   
+   pkgDepCache::ActionGroup group(Cache);
    pkgProblemResolver Resolve(&Cache);
    List->SetFileList(FileNames);
-   
+
    bool Bad = false;
    for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {
@@ -593,7 +594,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
          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;
       }
       
@@ -636,6 +637,6 @@ pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd)
    if(DoInstallPreFork() == Failed)
       return Failed;
    
-   return DoInstallPostFork();
+   return DoInstallPostFork(statusFd);
 }
                                                                        /*}}}*/