Fix a bug introduced in Rev.2159 on line 398, also fix another potential bug.

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 7a0f11d85b06b7b177210f7d7a55adbdbe16299b..ee4798911f1a495c3bb98658280207a1d647c980 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -322,7 +322,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
 {
    if (Debug) {
       VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
 {
    if (Debug) {
       VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);

-      clog << "SmartConfigure " << Pkg.Name() << InstallVer.VerStr() << endl;
+      clog << "SmartConfigure " << Pkg.Name() << " " << InstallVer.VerStr() << endl;

    }
 
    // If this is true, only check and correct and dependancies without the Loop flag
    }
 
    // If this is true, only check and correct and dependancies without the Loop flag


@@ -391,11 +391,11 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
         /* If the dependany is still not satisfied, try, if possible, unpacking a package to satisfy it */
         if (InstallVer != 0 && Bad) {
            Bad = false;
         /* If the dependany is still not satisfied, try, if possible, unpacking a package to satisfy it */
         if (InstallVer != 0 && Bad) {
            Bad = false;

-           if (!List->IsFlag(DepPkg,pkgOrderList::Loop)) {
+           if (List->IsNow(DepPkg) && !List->IsFlag(DepPkg,pkgOrderList::Loop)) {

               List->Flag(Pkg,pkgOrderList::Loop);
               if (Debug) 
                  cout << "  Unpacking " << DepPkg.Name() << " to avoid loop" << endl;
               List->Flag(Pkg,pkgOrderList::Loop);
               if (Debug) 
                  cout << "  Unpacking " << DepPkg.Name() << " to avoid loop" << endl;

-              SmartUnPack(DepPkg, false);
+              SmartUnPack(DepPkg, true);

               List->RmFlag(Pkg,pkgOrderList::Loop);
            }
         }
               List->RmFlag(Pkg,pkgOrderList::Loop);
            }
         }


@@ -527,9 +527,9 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
       clog << "SmartUnPack " << Pkg.Name();
       VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
       if (Pkg.CurrentVer() == 0)
       clog << "SmartUnPack " << Pkg.Name();
       VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
       if (Pkg.CurrentVer() == 0)

-        cout << "(install version " << InstallVer.VerStr() << ")" << endl;
+        cout << " (install version " << InstallVer.VerStr() << ")" << endl;

       else
       else

-        cout << "(replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")" << endl;
+        cout << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")" << endl;

    }
 
    // Check if it is already unpacked
    }
 
    // Check if it is already unpacked