From 90139c7075afb283428d561b81037039bc7ba149 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 21 Nov 2015 18:15:22 +0100 Subject: show potentially arch-qualified fullname in 'apt show' We do not show the architecture as a dedicated field as this is rather technical information, but as packagename it makes sense to show the architecture as other part of apt will refer to it in this way. --- test/integration/test-apt-cli-show | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show index 59dd6ba25..3718f0e9e 100755 --- a/test/integration/test-apt-cli-show +++ b/test/integration/test-apt-cli-show @@ -5,17 +5,12 @@ TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment -configarchitecture "i386" +configarchitecture 'i386' 'amd64' -if [ ! -x ${BUILDDIRECTORY}/apt ]; then - msgmsg "No ${BUILDDIRECTORY}/apt" - msgskip - exit 0 -fi - -DESCR='Some description +DESCR='Some description That has multiple lines' insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR" +insertpackage 'unstable' 'bar' 'i386,amd64' '1' '' '' "$DESCR" insertinstalledpackage 'foo' 'all' '1.0' setupaptarchive @@ -33,9 +28,31 @@ Installed-Size: 43.0 kB Download-Size: unknown APT-Manual-Installed: yes APT-Sources: file:$APTARCHIVE unstable/main all Packages -Description: Some description +Description: Some description That has multiple lines " apt show foo +testsuccessequal "Package: bar +Version: 1 +Priority: optional +Section: other +Maintainer: Joe Sixpack +Installed-Size: 43.0 kB +Download-Size: unknown +APT-Sources: file:$APTARCHIVE unstable/main i386 Packages +Description: Some description + That has multiple lines +" apt show bar +testsuccessequal "Package: bar:amd64 +Version: 1 +Priority: optional +Section: other +Maintainer: Joe Sixpack +Installed-Size: 43.0 kB +Download-Size: unknown +APT-Sources: file:$APTARCHIVE unstable/main amd64 Packages +Description: Some description + That has multiple lines +" apt show bar:amd64 # this is the default, but disabled by the testcases testsuccess apt show foo -o Apt::Cmd::Disable-Script-Warning=0 -- cgit v1.2.3-70-g09d2