From: Michael Vogt <mvo@ubuntu.com>
Date: Mon, 29 Sep 2014 09:47:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'debian/debian/experimental' into feature/acq-trans
X-Git-Tag: 1.1.exp4~6^2~33
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/7a8e00715588564a5b9434eaad65f2c6d3e513bb?ds=inline;hp=-c

Merge remote-tracking branch 'debian/debian/experimental' into feature/acq-trans
---

7a8e00715588564a5b9434eaad65f2c6d3e513bb
diff --combined test/integration/test-bug-728500-tempdir
index e9df0a709,bdc38c3ca..37e5a013e
--- a/test/integration/test-bug-728500-tempdir
+++ b/test/integration/test-bug-728500-tempdir
@@@ -17,7 -17,7 +17,7 @@@ msgtest 'Test apt-get update with incor
  OUTPUT=$(mktemp)
  addtrap "rm $OUTPUT;"
  export TMPDIR=/does-not-exists
 -if aptget update >${OUTPUT} 2>&1; then
 +if aptget update -o Debug::Acquire::gpg=1 >${OUTPUT} 2>&1; then
  	msgpass
  else
  	echo
@@@ -27,3 -27,4 +27,4 @@@ f
  unset TMPDIR
  
  testequal 'coolstuff' aptcache pkgnames
+ testsuccess ls rootdir/var/lib/apt/lists/*InRelease