diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-06-29 11:01:19 +0000 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-06-29 11:01:19 +0000 |
commit | e23e673308e24ccbed5afa04179ade52d408db87 (patch) | |
tree | 1cbfb696781d0742f42d5ad780d4a04640dd0d0e /apt-pkg/algorithms.cc | |
parent | 0a57c0f0e4d0bc3474ce4d2101f36a997891d30d (diff) | |
parent | c024fee6fd45c7aff4732370ee48d660284f4933 (diff) |
* merged with ubuntu, only use the pkgCache::Flag::Auto flag for automatically installed packages
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-98
Install only one keyring on each branch (Closes: #316119)
* apt@packages.debian.org/apt--main--0--patch-99
Finalize 0.6.39
* apt@packages.debian.org/apt--ubuntu--0--patch-7
Merge with mainline
* apt@packages.debian.org/apt--ubuntu--0--patch-8
install only the ubuntu keyring
* apt@packages.debian.org/apt--ubuntu--0--patch-9
Finalize 0.6.39
* apt@packages.debian.org/apt--ubuntu--0--patch-10
Merge with mainline
* apt@packages.debian.org/apt--ubuntu--0--patch-11
Update configure.in
Diffstat (limited to 'apt-pkg/algorithms.cc')
-rw-r--r-- | apt-pkg/algorithms.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index bed90f5d0..c679e76f6 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1349,7 +1349,7 @@ bool pkgMarkUsed(pkgDepCache &Cache) // do the mark part for(pkgCache::PkgIterator p=Cache.PkgBegin(); !p.end(); ++p) { - if(Cache[p].InstallReason==pkgDepCache::Manual || + if(!(Cache[p].Flags & pkgCache::Flag::Auto) || (p->Flags & pkgCache::Flag::Essential)) { if(Cache[p].Keep() && !p.CurrentVer().end()) |