diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-23 08:12:02 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-23 08:12:02 +0100 |
| commit | 0c8b6001694bb0ddf9eb6bc4936151592e1a07fa (patch) | |
| tree | 3fb71c099cb6daaa2c6bb4ec51deaf6ae164f119 | |
| parent | 06293aa79b46efdec96910b2f678ce1cbdecc86d (diff) | |
include "Archive-Origin" in the apt show output
| -rw-r--r-- | apt-private/private-output.h | 6 | ||||
| -rw-r--r-- | apt-private/private-show.cc | 2 | ||||
| -rwxr-xr-x | test/integration/test-apt-cli-show | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/apt-private/private-output.h b/apt-private/private-output.h index c3c76bb92..ba04ee221 100644 --- a/apt-private/private-output.h +++ b/apt-private/private-output.h @@ -28,7 +28,7 @@ void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, bool include_summary=true); - +// helper to describe global state bool ShowList(std::ostream &out, std::string Title, std::string List, std::string VersionsList); void ShowBroken(std::ostream &out,CacheFile &Cache,bool Now); @@ -43,6 +43,10 @@ bool ShowEssential(std::ostream &out,CacheFile &Cache); void Stats(std::ostream &out, pkgDepCache &Dep); +// helpers to display single package data +std::string +GetArchiveSuite(pkgCacheFile &CacheFile, pkgCache::VerIterator ver); + // prompting bool YnPrompt(bool Default=true); bool AnalPrompt(const char *Text); diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc index 9a8386167..244347421 100644 --- a/apt-private/private-show.cc +++ b/apt-private/private-show.cc @@ -73,12 +73,14 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V, else package_size = _("unknown"); + std::string suite = GetArchiveSuite(CacheFile, V); TFRewriteData RW[] = { {"Conffiles",0}, {"Description",0}, {"Description-md5",0}, {"Installed-Size", installed_size.c_str(), 0}, {"Size", package_size.c_str(), "Download-Size"}, + {"Archive-Origin", suite.c_str(), 0}, {} }; if(TFRewrite(stdout, Tags, NULL, RW) == false) diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show index bbb2de7ef..ba56e3260 100755 --- a/test/integration/test-apt-cli-show +++ b/test/integration/test-apt-cli-show @@ -25,6 +25,7 @@ Architecture: all Version: 1.0 Filename: pool/main/foo/foo_1.0_all.deb Download-Size: unknown +Archive-Origin: unstable Description: Some description That has multiple lines " apt show foo |