* apt-pkg/packagemanager.cc:

  - iterate over all pre-depends or-group member instead of looping
    endlessly over the first member in SmartUnpack (LP: #985852)

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 093999bc243e66da1727838bfaf25a46f31f4200..b56619ef53c33abd2107c8c9bb311050851d610b 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -621,7 +621,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);


@@ -644,7 +644,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 164d84912b6d62256134706ec7167d8bac86d212..aa88bdd93c471c9e6def83a28d421891a379b952 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,12 @@ apt (0.9.2) unstable; urgency=low
   * apt-pkg/contrib/fileutl.cc:
     - redirect stderr from compressors to /dev/null
 
   * apt-pkg/contrib/fileutl.cc:
     - redirect stderr from compressors to /dev/null
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 19 Apr 2012 15:52:59 +0200
+  [ Malcolm Scott ]
+  * apt-pkg/packagemanager.cc:
+    - iterate over all pre-depends or-group member instead of looping
+      endlessly over the first member in SmartUnpack (LP: #985852)
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 19 Apr 2012 22:38:02 +0200

 
 apt (0.9.1) unstable; urgency=low
 
 
 apt (0.9.1) unstable; urgency=low