From: Michael Vogt <mvo@debian.org>
Date: Wed, 12 Feb 2014 08:23:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
X-Git-Tag: 0.9.15.2~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/183d522362c95309d70baa418b54096599c17653

Merge remote-tracking branch 'mvo/debian/sid' into debian/sid

Conflicts:
	test/integration/test-apt-get-download
---

183d522362c95309d70baa418b54096599c17653
diff --cc test/integration/test-apt-get-download
index ec809e0ce,0d92283f1..7cce6ef29
--- a/test/integration/test-apt-get-download
+++ b/test/integration/test-apt-get-download
@@@ -34,13 -34,13 +34,18 @@@ testequal "'file://${DEBFILE}' apt_2.0_
  # deb:677887
  testequal "E: Can't find a source to download version '1.0' of 'vrms:i386'" aptget download vrms
  
 -# deb:736962 - apt-get download foo && 
 -aptget download apt
 -aptget download apt
 +# deb:736962
 +testsuccess aptget download apt
 +testsuccess aptget download apt
 +testsuccess test -s apt_2.0_all.deb
 +
 +rm -f apt_1.0_all.deb apt_2.0_all.deb
 +
 +# deb:738103
 +testsuccess aptget download apt apt apt/unstable apt=2.0
  testsuccess test -s apt_2.0_all.deb
 -rm -f apt_1.0_all.deb
+ 
+ # deb:738103 - apt-get download foo foo fails
+ rm -f apt_*.deb
+ aptget download apt apt
+ testsuccess test -s apt_2.0_all.deb