Flag the package in the SmartUnPack method as UnPacked while solving breakages to...

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 4cba19dc027e1ffa84c112fdf67a4180f393a93a..a39e412bdc5ae48fc352908dc756a473accd5eba 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -685,11 +685,15 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
         for (Version **I = VList; *I != 0; I++)
         {
            VerIterator Ver(Cache,*I);
-           PkgIterator Pkg = Ver.ParentPkg();
+           PkgIterator BrokenPkg = Ver.ParentPkg();
            // Check if it needs to be unpacked
-           if (List->IsFlag(Pkg,pkgOrderList::InList) && Cache[Pkg].Delete() == false) {
+           if (List->IsFlag(BrokenPkg,pkgOrderList::InList) && Cache[BrokenPkg].Delete() == false && 
+               !List->IsFlag(BrokenPkg,pkgOrderList::UnPacked)) {
+             /* FIXME Setting the flag here prevents breakage loops, that can occur if BrokenPkg (or one of the 
+                packages it breaks) breaks Pkg */ 
+             List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
              // Found a break, so unpack the package
-             SmartUnPack(Pkg, false);
+             SmartUnPack(BrokenPkg, false);
            }
         }
       }