diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-20 10:37:04 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-20 10:37:04 +0200 |
commit | 518763f630873e35398d2537ebfabf97b5aea489 (patch) | |
tree | d7b36ef50a9301ac8099edc48a0ab9e563125198 /apt-pkg/deb/deblistparser.cc | |
parent | 8c6d0ba4e25baa7b0dffc4e06e76fc63a71e656f (diff) | |
parent | e6a12579e9e5d5735eda450cf2bb3986d828ab65 (diff) |
merged from lp:~donkult/apt/sid
Diffstat (limited to 'apt-pkg/deb/deblistparser.cc')
-rw-r--r-- | apt-pkg/deb/deblistparser.cc | 10 |
1 files changed, 8 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; |