From 188f297a2af4c15cb1d502360d1e478644b5b810 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 28 May 2017 22:26:17 +0200 Subject: show .diff/Index properly as ignored if we fallback Moving the code responsible for parsing the Index file from ::Done into the slightly earlier ::VerifyDone allows us to still "fail" the download if we can't make use of the Index for whatever reason, so that the progress log correctly displays "Ign" instead of "Get" for the file. This also makes quiet a few debug messages proper error messages (but those are still hidden by default for Ign lines). --- test/integration/test-pdiff-usage | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index 430551fa4..e7b052d49 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -50,7 +50,7 @@ wasmergeused() { if echo "$*" | grep -q -- '-o test::cannot-use-pdiff=1'; then msgtest 'Check if pdiff was' 'not used' cp -a rootdir/tmp/testsuccess.output rootdir/tmp/aptupdate.output - testsuccess --nomsg grep "diff/Index with Message: Couldn't parse pdiff index" rootdir/tmp/aptupdate.output + testsuccess --nomsg grep "^Ign:.* Packages\.diff/Index" rootdir/tmp/aptupdate.output return; fi @@ -336,7 +336,7 @@ SHA256-Download: generatereleasefiles '+1hour' signreleasefiles wasmergeused "$@" -o test::cannot-use-pdiff=1 - testsuccess grep 'bytes (Limit is' rootdir/tmp/aptupdate.output + testsuccess grep 'bytes, but limit is' rootdir/tmp/aptupdate.output testnopackage oldstuff testsuccessequal "$(cat "${PKGFILE}-new") " aptcache show apt newstuff -- cgit v1.2.3