summaryrefslogtreecommitdiff
path: root/apt-pkg/depcache.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-02-14 14:07:17 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-02-14 14:07:17 +0100
commit8d009e3e8ac6c6431a8bc79a07d9ad7c0295d160 (patch)
tree361496f3f028a8c876c1059fd547b0191237ce67 /apt-pkg/depcache.cc
parent5645e8b1cebb57134df717b8339248811cb762f2 (diff)
parent94244f75f8280c9b4018736d503d17455c284b2d (diff)
merged from debian-sid
Diffstat (limited to 'apt-pkg/depcache.cc')
-rw-r--r--apt-pkg/depcache.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 4c12a4fe1..a8bf4d3ae 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1261,9 +1261,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