diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-20 09:40:37 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-20 09:40:37 +0200 |
| commit | 48818c02fdf72168f1a2d9d58e2498adcda27c27 (patch) | |
| tree | 24060f8d5ae81d8026679dd4872e49d59adb1bde | |
| parent | 6f653b1aa0331b70c8042f7c4a8ef8ad5fe4d0ae (diff) | |
merge patch from Malcolm Scott for bug #985852
| -rw-r--r-- | apt-pkg/packagemanager.cc | 4 | ||||
| -rw-r--r-- | debian/changelog | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 14a227e3e..9175cc3ad 100644 --- 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) { - SPtrArray<Version *> VList = Start.AllTargets(); + SPtrArray<Version *> VList = Cur.AllTargets(); 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) { - 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 e4dc1d65d..6bb514f8a 100644 --- 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: |