From e089284d624347fb6519a8f6ef7bf13335ed9317 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 20 Apr 2012 09:50:23 +0200
Subject: cherry pick max-loop count patch
---
apt-pkg/packagemanager.cc | 14 ++++++++++++--
debian/changelog | 6 ++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 9175cc3ad..2a71d878e 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -338,7 +338,10 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
however if there is a loop (A depends on B, B depends on A) this will not
be the case, so check for dependencies before configuring. */
bool Bad = false, Changed = false;
- do {
+ const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 100);
+ unsigned int i=0;
+ do
+ {
Changed = false;
for (DepIterator D = instVer.DependsList(); D.end() == false; )
{
@@ -461,6 +464,8 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
if (Bad == true && Changed == false && Debug == true)
std::clog << OutputInDepth(Depth) << "Could not satisfy " << Start << std::endl;
}
+ if (i++ > max_loops)
+ return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack for %s, aborting", Pkg.FullName().c_str());
} while (Changed == true);
if (Bad) {
@@ -595,7 +600,10 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured),
or by the ConfigureAll call at the end of the for loop in OrderInstall. */
bool Changed = false;
- do {
+ const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 100);
+ unsigned int i=0;
+ do
+ {
Changed = false;
for (DepIterator D = instVer.DependsList(); D.end() == false; )
{
@@ -820,6 +828,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
}
}
}
+ if (i++ > max_loops)
+ return _error->Error("Internal error: MaxLoopCount reached in SmartConfigure for %s, aborting", Pkg.FullName().c_str());
} while (Changed == true);
// Check for reverse conflicts.
diff --git a/debian/changelog b/debian/changelog
index 6bb514f8a..d637beb59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,12 @@ apt (0.8.16~exp12ubuntu10) UNRELEASEDprecise-proposed; urgency=low
other than the first specified is already installed, apt-get enters an
infinite loop (LP: #985852)
+ [ Michael Vogt ]
+ * apt-pkg/packagemanager.cc:
+ - add APT::pkgPackageManager::MaxLoopCount to ensure that the
+ ordering code does not get into a endless loop when it flip-flops
+ between two states
+
-- Malcolm Scott <launchpad@malc.org.uk> Thu, 19 Apr 2012 19:52:56 +0100
apt (0.8.16~exp12ubuntu9) precise-proposed; urgency=low
--
cgit v1.2.3