summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-private/private-show.cc15
-rwxr-xr-xtest/integration/test-apt-cli-show8
2 files changed, 15 insertions, 8 deletions
diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc
index ba8b266ee..60d951316 100644
--- a/apt-private/private-show.cc
+++ b/apt-private/private-show.cc
@@ -76,12 +76,12 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V,
// make size nice
std::string installed_size;
if (Tags.FindI("Installed-Size") > 0)
- installed_size = SizeToStr(Tags.FindI("Installed-Size")*1024);
+ strprintf(installed_size, "%sB", SizeToStr(Tags.FindI("Installed-Size")*1024).c_str());
else
installed_size = _("unknown");
std::string package_size;
if (Tags.FindI("Size") > 0)
- package_size = SizeToStr(Tags.FindI("Size"));
+ strprintf(package_size, "%sB", SizeToStr(Tags.FindI("Size")).c_str());
else
package_size = _("unknown");
@@ -92,9 +92,18 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V,
manual_installed = !(state.Flags & pkgCache::Flag::Auto) ? "yes" : "no";
else
manual_installed = 0;
+
+ // FIXME: add verbose that does not do the removal of the tags?
TFRewriteData RW[] = {
- // delete
+ // delete, apt-cache show has this info and most users do not care
+ {"MD5sum", 0},
+ {"SHA1", 0},
+ {"SHA256", 0},
+ {"Filename", 0},
+ {"Multi-Arch", 0},
+ {"Architecture", 0},
{"Conffiles",0},
+ // we use the translated description
{"Description",0},
{"Description-md5",0},
// improve
diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show
index 11a93f268..91cc9a3c0 100755
--- a/test/integration/test-apt-cli-show
+++ b/test/integration/test-apt-cli-show
@@ -21,14 +21,12 @@ APTARCHIVE=$(readlink -f ./aptarchive)
testequal "Package: foo
Priority: optional
Section: other
-Installed-Size: 43.0 k
+Installed-Size: 43.0 kB
Maintainer: Joe Sixpack <joe@example.org>
-Architecture: all
Version: 1.0
-Filename: pool/main/foo/foo_1.0_all.deb
Download-Size: unknown
-Archive-Origin: unstable,now
-Manual-Installed: yes
+APT-Manual-Installed: yes
+APT-Sources: file:$APTARCHIVE/ unstable/main i386 Packages
Description: Some description
That has multiple lines
" apt show foo