summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2012-03-05 15:10:54 +0100
committerJulian Andres Klode <jak@debian.org>2012-03-05 15:10:54 +0100
commitfb805d80bfc6027e2242796dbda306e712cfac09 (patch)
treef306d3d542d340ccc946b497d13ffa18ea648539
parent945099df10a67c3c7f52fcfef165a2782e51809e (diff)
* apt-pkg/packagemanager.cc:
- Do not use immediate configuration for packages with the Important flag
-rw-r--r--apt-pkg/packagemanager.cc3
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 2 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index a370f15a3..4eb539579 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -184,8 +184,7 @@ bool pkgPackageManager::CreateOrderList()
continue;
// Mark the package and its dependends for immediate configuration
- if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||
- (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&
+ if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) &&
NoImmConfigure == false) || ImmConfigureAll)
{
if(Debug && !ImmConfigureAll)
diff --git a/debian/changelog b/debian/changelog
index cd911d3dd..9ecf363c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,8 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low
[ Julian Andres Klode ]
* apt-pkg/deb/deblistparser.cc:
- Set the Essential flag on APT instead of only Important
+ * apt-pkg/packagemanager.cc:
+ - Do not use immediate configuration for packages with the Important flag
-- David Kalnischkies <kalnischkies@gmail.com> Mon, 30 Jan 2012 19:17:09 +0100