* wording fixes (cherry picked from apt--mvo)

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index a08ccd6027c293f7bc91cfe761e679c648195db3..4b3dd8be20ea0b82f7ae1844b2c2ffd22d3226aa 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;
       }
       


@@ -631,11 +631,13 @@ 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()
+pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd)

 {
    OrderResult Res = OrderInstall();
 {
    OrderResult Res = OrderInstall();

+   if(Debug)
+      std::clog << "OrderInstall() returned: " << Res << std::endl;

    if (Res != Failed)
    if (Res != Failed)

-      if (Go() == false)
+      if (Go(status_fd) == false)

         return Failed;
    return Res;
 }
         return Failed;
    return Res;
 }