Browse Source

Show only the candidate with "apt show"

Display only the candidate version with "apt show pkg" but show
a notice that there is more to see.
debian/1.8.y
Michael Vogt 9 years ago
parent
commit
06293aa79b
  1. 4
      apt-private/private-cmndline.cc
  2. 10
      apt-private/private-show.cc

4
apt-private/private-cmndline.cc

@ -235,6 +235,10 @@ bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * const Cm
// FIXME: find a better term
addArg(0,"dist","APT::Cmd::Dist-Upgrade", CommandLine::Boolean);
}
else if (CmdMatches("show"))
{
addArg('a', "all-versions", "APT::Cache::AllVersions", 0);
}
else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd))
{
// we have no (supported) command-name overlaps so far, so we call

10
apt-private/private-show.cc

@ -104,12 +104,20 @@ bool ShowPackage(CommandLine &CmdL) /*{{{*/
{
pkgCacheFile CacheFile;
CacheSetHelperVirtuals helper(true, GlobalError::NOTICE);
APT::VersionList::Version const select = APT::VersionList::CANDIDATE;
APT::VersionList::Version const select = _config->FindB("APT::Cache::AllVersions", false) ?
APT::VersionList::ALL : APT::VersionList::CANDIDATE;
APT::VersionList const verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper);
for (APT::VersionList::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver)
if (DisplayRecord(CacheFile, Ver, c1out) == false)
return false;
if (select == APT::VersionList::CANDIDATE)
{
APT::VersionList const verset_all = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionList::ALL, helper);
if (verset_all.size() > verset.size())
_error->Notice(ngettext("There is %lu additional record. Please use the '-a' switch to see it", "There are %lu additional records. Please use the '-a' switch to see them.", verset_all.size() - verset.size()), verset_all.size() - verset.size());
}
for (APT::PackageSet::const_iterator Pkg = helper.virtualPkgs.begin();
Pkg != helper.virtualPkgs.end(); ++Pkg)
{

Loading…
Cancel
Save