add APT::Cmd::List-Include-Summary

diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 8ba6629a802d4b26c5e74c187d839e1d47850a70..b73227924a7f13db843289dc110cd2abcb85ef7a 100644 (file)
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -223,6 +223,7 @@ bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * const Cm
       addArg(0,"installed","APT::Cmd::Installed",0);
       addArg(0,"upgradable","APT::Cmd::Upgradable",0);
       addArg('a', "all-versions", "APT::Cmd::AllVersions", 0);
       addArg(0,"installed","APT::Cmd::Installed",0);
       addArg(0,"upgradable","APT::Cmd::Upgradable",0);
       addArg('a', "all-versions", "APT::Cmd::AllVersions", 0);

+      addArg('v', "verbose", "APT::Cmd::List-Include-Summary", 0);

    }
    else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd))
    {
    }
    else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd))
    {

diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index 6993cd797b020d00de140fb6684fdf349c3aad0f..08851eb7e92978c00bc273e9eba9aa42b158c4bb 100644 (file)
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -132,6 +132,8 @@ bool List(CommandLine &Cmd)
    std::map<std::string, std::string> output_map;
    std::map<std::string, std::string>::const_iterator K;
 
    std::map<std::string, std::string> output_map;
    std::map<std::string, std::string>::const_iterator K;
 

+   bool includeSummary = _config->FindB("APT::Cmd::List-Include-Summary");
+

    PackageNameMatcher matcher(patterns);
    LocalitySortedVersionSet bag;
    OpTextProgress progress;
    PackageNameMatcher matcher(patterns);
    LocalitySortedVersionSet bag;
    OpTextProgress progress;


@@ -149,7 +151,7 @@ bool List(CommandLine &Cmd)
          output_map.insert(std::make_pair<std::string, std::string>(
             V.ParentPkg().Name(), outs.str()));
       } else {
          output_map.insert(std::make_pair<std::string, std::string>(
             V.ParentPkg().Name(), outs.str()));
       } else {

-         ListSingleVersion(CacheFile, records, V, outs, false);
+         ListSingleVersion(CacheFile, records, V, outs, includeSummary);

          output_map.insert(std::make_pair<std::string, std::string>(
                            V.ParentPkg().Name(), outs.str()));
       }
          output_map.insert(std::make_pair<std::string, std::string>(
                            V.ParentPkg().Name(), outs.str()));
       }