diff options
| author | Michael Vogt <mvo@debian.org> | 2011-02-14 12:05:35 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2011-02-14 12:05:35 +0100 |
| commit | 1fc07a44e8191e00fc1566bfc15e8b370da77330 (patch) | |
| tree | 94603cf04d736dc500130389f2ef5ba4b027c8bc /apt-pkg/depcache.cc | |
| parent | 1dda80929fcd62c287a84f1ecc1277fc39890efe (diff) | |
| parent | 2cae0ccb49efbeebe33f364b61e639ebf2639bdd (diff) | |
merged from lp:~donkult/apt/sid
Diffstat (limited to 'apt-pkg/depcache.cc')
| -rw-r--r-- | apt-pkg/depcache.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 7c09d3a38..0c5b77732 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1257,9 +1257,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if(FromUser) { - // Set it to manual if it's a new install or cancelling the - // removal of a garbage package. - if(P.Status == 2 || (!Pkg.CurrentVer().end() && !P.Marked)) + // Set it to manual if it's a new install or already installed + if(P.Status == 2 || Pkg->CurrentVer != 0) P.Flags &= ~Flag::Auto; } else |