Просмотр исходного кода

* apt-pkg/packagemanager.cc:
- iterate over all pre-depends or-group member instead of looping
endlessly over the first member in SmartUnpack (LP: #985852)

Malcolm Scott лет назад: 14
Родитель
Сommit
d8e25d34e8
2 измененных файлов с 8 добавлено и 3 удалено
  1. 2 2
      apt-pkg/packagemanager.cc
  2. 6 1
      debian/changelog

+ 2 - 2
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)
 	    {
-	       SPtrArray<Version *> VList = Start.AllTargets();
+	       SPtrArray<Version *> VList = Cur.AllTargets();
 	       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)
 	    {
-	       SPtrArray<Version *> VList = Start.AllTargets();
+	       SPtrArray<Version *> VList = Cur.AllTargets();
 	       for (Version **I = VList; *I != 0; ++I)
 	       {
 		  VerIterator Ver(Cache,*I);

+ 6 - 1
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
 
- -- 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