diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-11-06 08:55:06 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-11-06 08:55:06 +0100 |
| commit | 9397ea947c23c0957a683152360909810340abce (patch) | |
| tree | 6b29e35b9ef602c15d0aab20eefdec3138eb4692 /test/integration/test-apt-update-ims | |
| parent | 87ecd6a2d719aeaeedd99dd500b467e966376f1c (diff) | |
| parent | 6e2261d0f250406058d66b360080aa986953ae19 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/no-more-acquire-guessing
Conflicts:
apt-pkg/acquire-item.cc
Diffstat (limited to 'test/integration/test-apt-update-ims')
| -rwxr-xr-x | test/integration/test-apt-update-ims | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims index afae99563..5394a9f30 100755 --- a/test/integration/test-apt-update-ims +++ b/test/integration/test-apt-update-ims @@ -30,7 +30,7 @@ runtest() { # ensure that we still do a hash check on ims hit msgtest 'Test I-M-S' 'reverify' - aptget update -o Debug::pkgAcquire::Auth=1 2>&1 | grep -A1 'RecivedHash:' | grep -q -- '- SHA' && msgpass || msgfail + aptget update -o Debug::pkgAcquire::Auth=1 2>&1 | grep -A2 'RecivedHash:' | grep -q -- '- SHA' && msgpass || msgfail # ensure no leftovers in partial testfailure ls "rootdir/var/lib/apt/lists/partial/*" |