summaryrefslogtreecommitdiff
path: root/apt-pkg/depcache.cc
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-02-11 17:47:50 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-02-11 17:47:50 +0100
commitfdbe726599ae4dd3d808858356cf3464de94f1e4 (patch)
treec3b4101fbc3e698c12db66ebb6748f249c7408ac /apt-pkg/depcache.cc
parentec7f904e7ea1b0b8aaefbbb202ced9e19292dd76 (diff)
* apt-pkg/depcache.cc:
- mark a package which was requested to be installed on commandline always as manual regardless if it is already marked or not as the marker could be lost later by the removal of rdepends (Closes: #612557)
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 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