merge patch from Malcolm Scott for bug #985852

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 14a227e3eec809c4e28db029ba1e5ace81c28146..9175cc3add5a613a5dd6509f5df325a287fe34eb 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -612,7 +612,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
            // Look for easy targets: packages that are already okay
            for (DepIterator Cur = Start; Bad == true; ++Cur)
            {
            // Look for easy targets: packages that are already okay
            for (DepIterator Cur = Start; Bad == true; ++Cur)
            {

-              SPtrArray<Version *> VList = Start.AllTargets();
+              SPtrArray<Version *> VList = Cur.AllTargets();

               for (Version **I = VList; *I != 0; ++I)
               {
                  VerIterator Ver(Cache,*I);
               for (Version **I = VList; *I != 0; ++I)
               {
                  VerIterator Ver(Cache,*I);


@@ -635,7 +635,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
            // Look for something that could be configured.
            for (DepIterator Cur = Start; Bad == true; ++Cur)
            {
            // Look for something that could be configured.
            for (DepIterator Cur = Start; Bad == true; ++Cur)
            {

-              SPtrArray<Version *> VList = Start.AllTargets();
+              SPtrArray<Version *> VList = Cur.AllTargets();

               for (Version **I = VList; *I != 0; ++I)
               {
                  VerIterator Ver(Cache,*I);
               for (Version **I = VList; *I != 0; ++I)
               {
                  VerIterator Ver(Cache,*I);

diff --git a/debian/changelog b/debian/changelog
index e4dc1d65d15d59ce437edaf695dfc7d361dff896..6bb514f8ae769c0565cdc89f6eedeb53ad155beb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.8.16~exp12ubuntu10) UNRELEASEDprecise-proposed; urgency=low
+
+  [ Malcolm Scott ]
+  * apt-pkg/packagemanager.cc:
+    - Fix a regression in the pre-depend handling: where a pre-depend option
+      other than the first specified is already installed, apt-get enters an
+      infinite loop (LP: #985852)
+
+ -- Malcolm Scott <launchpad@malc.org.uk>  Thu, 19 Apr 2012 19:52:56 +0100
+

 apt (0.8.16~exp12ubuntu9) precise-proposed; urgency=low
 
   * apt-inst/contrib/extracttar.cc:
 apt (0.8.16~exp12ubuntu9) precise-proposed; urgency=low
 
   * apt-inst/contrib/extracttar.cc: