From: Michael Vogt <mvo@debian.org>
Date: Fri, 11 Apr 2014 12:40:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'mvo/feature/helpful-apt-list' into debian/sid
X-Git-Tag: 1.0.2~7
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/23fc5ecaa01bc41d582640dd5950be73987a8b4b?hp=-c

Merge remote-tracking branch 'mvo/feature/helpful-apt-list' into debian/sid

Conflicts:
	test/integration/test-apt-cli-list
---

23fc5ecaa01bc41d582640dd5950be73987a8b4b
diff --combined test/integration/test-apt-cli-list
index 6fc4bc7f6,b738bcc66..40bf81a39
--- a/test/integration/test-apt-cli-list
+++ b/test/integration/test-apt-cli-list
@@@ -19,12 -19,17 +19,17 @@@ insertinstalledpackage 'bar' 'i386' '1.
  insertinstalledpackage 'foobar' 'i386' '1.0'
  insertpackage 'unstable' 'foobar' 'i386' '2.0'
  
+ insertinstalledpackage 'baz' 'all' '0.1'
+ insertpackage 'testing' 'baz' 'all' '1.0'
+ insertpackage 'unstable' 'baz' 'all' '2.0'
+ 
  setupaptarchive
  
  APTARCHIVE=$(readlink -f ./aptarchive)
  
  testequal "Listing...
  bar/now 1.0 i386 [installed,local]
+ baz/unstable 2.0 all [upgradable from: 0.1]
  foo/unstable 1.0 all
  foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list
  
@@@ -33,12 -38,14 +38,14 @@@ foo/unstable 1.0 al
  foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list "foo*"
  
  testequal "Listing...
+ baz/unstable 2.0 all [upgradable from: 0.1]
  foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list --upgradable
  
  # FIXME: hm, hm - does it make sense to have this different? shouldn't
  #        we use "installed,upgradable" consitently?
  testequal "Listing...
  bar/now 1.0 i386 [installed,local]
+ baz/now 0.1 all [installed,upgradable to: 2.0]
  foobar/now 1.0 i386 [installed,upgradable to: 2.0]" apt list --installed
  
  testequal "Listing...
@@@ -51,8 -58,8 +58,14 @@@ bar/now 1.0 i386 [installed,local
    an autogenerated dummy bar=1.0/installed
  " apt list bar --verbose
  
 +# test for dpkg ^rc state
 +insertinstalledpackage 'conf-only' 'i386' '1.0' '' '' 'deinstall ok config-files'
 +testequal "Listing...
 +conf-only/now 1.0 i386 [residual-config]" apt list conf-only
 +
+ # ensure that the users learns about multiple versions too
+ testequal "Listing...
+ baz/unstable 2.0 all [upgradable from: 0.1]
+ N: There are 2 additional versions. Please use the '-a' switch to see them." apt list baz -o quiet=0
+ 
++