diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-18 08:51:53 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-18 08:51:53 +0100 |
| commit | 47d7761243a02368bb60b7227bd05a19ca4660d1 (patch) | |
| tree | c298a2054c22aae934e25dd22a023efe76649b89 /apt-private/private-cacheset.cc | |
| parent | ea62d40da6b402ff8d4d346971b98e24f096e521 (diff) | |
| parent | 8a59cc322ac57c6662949e957611ed718a5f5119 (diff) | |
Merge remote-tracking branch 'mvo/debian/sid' into debian/experimental-no-abi-break
Diffstat (limited to 'apt-private/private-cacheset.cc')
| -rw-r--r-- | apt-private/private-cacheset.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/apt-private/private-cacheset.cc b/apt-private/private-cacheset.cc index 6fb224010..a7dc0e800 100644 --- a/apt-private/private-cacheset.cc +++ b/apt-private/private-cacheset.cc @@ -52,6 +52,15 @@ bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, output_set.insert(policy->GetCandidateVer(P)); } } + else if (_config->FindB("APT::Cmd::Manual-Installed") == true) + { + if (P.CurrentVer() && + ((*DepCache)[P].Flags & pkgCache::Flag::Auto) == false) + { + pkgPolicy *policy = CacheFile.GetPolicy(); + output_set.insert(policy->GetCandidateVer(P)); + } + } else { pkgPolicy *policy = CacheFile.GetPolicy(); |