* 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 155408bb45506404b19551e21be2d299ddd626d3..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()
 {   
    be downloaded. */
 bool pkgPackageManager::FixMissing()
 {   

+   pkgDepCache::ActionGroup group(Cache);

    pkgProblemResolver Resolve(&Cache);
    List->SetFileList(FileNames);
    pkgProblemResolver Resolve(&Cache);
    List->SetFileList(FileNames);

-   
+

    bool Bad = false;
    for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {
    bool Bad = false;
    for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {


@@ -106,7 +107,7 @@ bool pkgPackageManager::FixMissing()
    
       // Okay, this file is missing and we need it. Mark it for keep 
       Bad = true;
    
       // Okay, this file is missing and we need it. Mark it for keep 
       Bad = true;

-      Cache.MarkKeep(I);
+      Cache.MarkKeep(I, false, false);

    }
  
    // We have to empty the list otherwise it will not have the new changes
    }
  
    // We have to empty the list otherwise it will not have the new changes


@@ -593,7 +594,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;
       }
       


@@ -631,12 +632,11 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
 // ---------------------------------------------------------------------
 /* This uses the filenames in FileNames and the information in the
    DepCache to perform the installation of packages.*/
 // ---------------------------------------------------------------------
 /* This uses the filenames in FileNames and the information in the
    DepCache to perform the installation of packages.*/

-pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd)
+pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd)

 {
 {

-   OrderResult Res = OrderInstall();
-   if (Res != Failed)
-      if (Go(status_fd) == false)
-        return Failed;
-   return Res;
+   if(DoInstallPreFork() == Failed)
+      return Failed;
+   
+   return DoInstallPostFork(statusFd);

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