summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-03-06 17:36:59 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-03-06 17:36:59 +0100
commite8184cc38f673a3d86be9268525cf259120c2a9e (patch)
tree221c9efcf97860449b2948945051c1fc6072333f /apt-pkg/deb
parent84e254d6aee034fec6ca10c4e5765d1280d0de0e (diff)
parente2625f67efae93c2c8affff41ce3e5fb9a507f30 (diff)
merge with apt/experimental
* apt-pkg/packagemanager.cc: - fix bug in predepends handling - ensure that packages that needs unpackaging are unpacked before they are configured (LP: #927993) [ 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 * Treat the Important flag like the Essential flag with those differences: - No Immediate configuration (see above) - Not automatically installed during dist-upgrade - No higher score for installation ordering
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/deblistparser.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index bdb50f6bf..84e6c38c5 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -249,7 +249,7 @@ bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg,
return false;
if (strcmp(Pkg.Name(),"apt") == 0)
- Pkg->Flags |= pkgCache::Flag::Important;
+ Pkg->Flags |= pkgCache::Flag::Essential | pkgCache::Flag::Important;
if (ParseStatus(Pkg,Ver) == false)
return false;