X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/15847d263c371cadcb8664021b8eb2444dd70998..e96e4e9cef3a0137b789117f72a93a8e9106562e:/apt-private/private-list.cc diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc index 8c61fcae8..a02ebf02d 100644 --- a/apt-private/private-list.cc +++ b/apt-private/private-list.cc @@ -69,7 +69,7 @@ class PackageNameMatcher : public Matcher /*{{{*/ cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern); #else APT::CacheFilter::PackageMatcher *cachefilter = NULL; - if(_config->FindB("APT::Cmd::UseRegexp", false) == true) + if(_config->FindB("APT::Cmd::Use-Regexp", false) == true) cachefilter = new APT::CacheFilter::PackageNameMatchesRegEx(pattern); else cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern); @@ -132,6 +132,8 @@ bool List(CommandLine &Cmd) std::map output_map; std::map::const_iterator K; + bool includeSummary = _config->FindB("APT::Cmd::List-Include-Summary"); + PackageNameMatcher matcher(patterns); LocalitySortedVersionSet bag; OpTextProgress progress; @@ -143,13 +145,13 @@ bool List(CommandLine &Cmd) for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); V++) { std::stringstream outs; - if(_config->FindB("APT::Cmd::AllVersions", false) == true) + if(_config->FindB("APT::Cmd::All-Versions", false) == true) { ListAllVersions(CacheFile, records, V.ParentPkg(), outs); output_map.insert(std::make_pair( V.ParentPkg().Name(), outs.str())); } else { - ListSingleVersion(CacheFile, records, V, outs); + ListSingleVersion(CacheFile, records, V, outs, includeSummary); output_map.insert(std::make_pair( V.ParentPkg().Name(), outs.str())); }