summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-04-18 18:13:30 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-04-18 18:13:30 +0200
commita552f37ebad5718bba7767e606f3cca13690fbd8 (patch)
treebc929471beeac26898f6b36227466bc0b7f0a38f
parentbce0e0ff327341da3ad54d7ea2bb6d82b3f96879 (diff)
* apt-pkg/deb/deblistparser.cc:
- only treat the native apt as essential by default
-rw-r--r--apt-pkg/deb/deblistparser.cc10
-rw-r--r--debian/changelog8
2 files changed, 16 insertions, 2 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 84e6c38c5..00e2bd900 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -249,8 +249,14 @@ bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg,
return false;
if (strcmp(Pkg.Name(),"apt") == 0)
- Pkg->Flags |= pkgCache::Flag::Essential | pkgCache::Flag::Important;
-
+ {
+ if ((essential == "native" && Pkg->Arch != 0 && myArch == Pkg.Arch()) ||
+ essential == "all")
+ Pkg->Flags |= pkgCache::Flag::Essential | pkgCache::Flag::Important;
+ else
+ Pkg->Flags |= pkgCache::Flag::Important;
+ }
+
if (ParseStatus(Pkg,Ver) == false)
return false;
return true;
diff --git a/debian/changelog b/debian/changelog
index 8eca51cc4..58da9d8de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.9.1+nmu1) unstable; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/deb/deblistparser.cc:
+ - only treat the native apt as essential by default
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Wed, 18 Apr 2012 18:12:07 +0200
+
apt (0.9.1) unstable; urgency=low
[ David Kalnischkies ]