diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-11 14:39:28 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-11 14:39:28 +0200 |
| commit | 473ccfb9454e2707c2145ec49e671b78dc775e0c (patch) | |
| tree | eb3981929f6b51a856fd9c3f307ab729a061a0e7 | |
| parent | 4cd4a2e7033a2af214be1d830b56fab719088b7a (diff) | |
| parent | c8259fcde18ad9e08fffb04bf06ed64b87b1ac6a (diff) | |
Merge remote-tracking branch 'mvo/bugfix/apt-list-rc-pkgs' into debian/sid
| -rw-r--r-- | apt-private/private-cacheset.cc | 8 | ||||
| -rw-r--r-- | apt-private/private-output.cc | 4 | ||||
| -rwxr-xr-x | test/integration/test-apt-cli-list | 5 |
3 files changed, 16 insertions, 1 deletions
diff --git a/apt-private/private-cacheset.cc b/apt-private/private-cacheset.cc index 4a63c7e81..e37e7b227 100644 --- a/apt-private/private-cacheset.cc +++ b/apt-private/private-cacheset.cc @@ -73,7 +73,13 @@ bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, else { pkgPolicy *policy = CacheFile.GetPolicy(); - output_set.insert(policy->GetCandidateVer(P)); + if (policy->GetCandidateVer(P).IsGood()) + output_set.insert(policy->GetCandidateVer(P)); + else + // no candidate, this may happen for packages in + // dpkg "deinstall ok config-file" state - we pick the first ver + // (which should be the only one) + output_set.insert(P.VersionList()); } } progress.Done(); diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index bbd8545ad..757999167 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -146,6 +146,10 @@ static std::string GetArchitecture(pkgCacheFile &CacheFile, pkgCache::PkgIterato pkgCache::VerIterator inst = P.CurrentVer(); pkgCache::VerIterator cand = policy->GetCandidateVer(P); + // this may happen for packages in dpkg "deinstall ok config-file" state + if (inst.IsGood() == false && cand.IsGood() == false) + return P.VersionList().Arch(); + return inst ? inst.Arch() : cand.Arch(); } /*}}}*/ diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list index 47cfb624a..6fc4bc7f6 100755 --- a/test/integration/test-apt-cli-list +++ b/test/integration/test-apt-cli-list @@ -51,3 +51,8 @@ bar/now 1.0 i386 [installed,local] an autogenerated dummy bar=1.0/installed " apt list bar --verbose +# test for dpkg ^rc state +insertinstalledpackage 'conf-only' 'i386' '1.0' '' '' 'deinstall ok config-files' +testequal "Listing... +conf-only/now 1.0 i386 [residual-config]" apt list conf-only + |