diff options
| author | Malcolm Scott <launchpad@malc.org.uk> | 2012-04-19 22:38:30 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-04-19 22:38:30 +0200 |
| commit | d8e25d34e89d66b4c38d6b19b4bb2af08f5bd019 (patch) | |
| tree | 3fecfe62a7da47b36578a9c8e73c12a954faa392 | |
| parent | 8eebbd5b3599c4fe0a6aa62589e3562725e1542a (diff) | |
* apt-pkg/packagemanager.cc:
- iterate over all pre-depends or-group member instead of looping
endlessly over the first member in SmartUnpack (LP: #985852)
| -rw-r--r-- | apt-pkg/packagemanager.cc | 4 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 093999bc2..b56619ef5 100644 --- 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) { - 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); diff --git a/debian/changelog b/debian/changelog index 164d84912..aa88bdd93 100644 --- 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 - -- 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 |