]> git.saurik.com Git - apt.git/commitdiff
Merge remote-tracking branch 'mvo/feature/helpful-apt-list' into debian/sid
authorMichael Vogt <mvo@debian.org>
Fri, 11 Apr 2014 12:40:08 +0000 (14:40 +0200)
committerMichael Vogt <mvo@debian.org>
Fri, 11 Apr 2014 12:40:08 +0000 (14:40 +0200)
Conflicts:
test/integration/test-apt-cli-list

1  2 
test/integration/test-apt-cli-list

index 6fc4bc7f6410715755322cea573ac690483a7fd9,b738bcc66f5a0d41ed5ddec1bb76722732151542..40bf81a399ea90559a792856be8212950a66e834
@@@ -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
++