diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-21 07:20:07 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-21 07:20:07 +0100 |
| commit | f744c64c591cec9e5aa489a9af55e1ed6d1871d1 (patch) | |
| tree | de1d27910d66062508b22c5a7b46c288d1b3fab9 /apt-private/private-list.cc | |
| parent | 7f316a3feab95370f1dd28c08c58bc3c140bf0a0 (diff) | |
| parent | 1700c3cfb902f3f61fa4d9269523467fcceaaf58 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental-no-abi-break' into feature/source-deb822
Conflicts:
test/integration/test-apt-sources-deb822
Diffstat (limited to 'apt-private/private-list.cc')
| -rw-r--r-- | apt-private/private-list.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc index a02ebf02d..fbb66d204 100644 --- a/apt-private/private-list.cc +++ b/apt-private/private-list.cc @@ -101,11 +101,15 @@ private: /*}}}*/ void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records, /*{{{*/ pkgCache::PkgIterator P, - std::ostream &outs) + std::ostream &outs, + bool include_summary=true) { for (pkgCache::VerIterator Ver = P.VersionList(); Ver.end() == false; Ver++) - ListSingleVersion(CacheFile, records, Ver, outs); + { + ListSingleVersion(CacheFile, records, Ver, outs, include_summary); + outs << "\n"; + } } /*}}}*/ // list - list package based on criteria /*{{{*/ @@ -136,7 +140,7 @@ bool List(CommandLine &Cmd) PackageNameMatcher matcher(patterns); LocalitySortedVersionSet bag; - OpTextProgress progress; + OpTextProgress progress(*_config); progress.OverallProgress(0, Cache->Head().PackageCount, Cache->Head().PackageCount, @@ -147,7 +151,7 @@ bool List(CommandLine &Cmd) std::stringstream outs; if(_config->FindB("APT::Cmd::All-Versions", false) == true) { - ListAllVersions(CacheFile, records, V.ParentPkg(), outs); + ListAllVersions(CacheFile, records, V.ParentPkg(), outs, includeSummary); output_map.insert(std::make_pair<std::string, std::string>( V.ParentPkg().Name(), outs.str())); } else { |