improve test for commit daff4a

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 2ced65aa2e21b5d76510fdc7b6d0a16f7af215c5..5df43726b19237e478c09917d440448e52784ab5 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1141,13 +1141,14 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
    else
       Local = true;
 
    else
       Local = true;
 

-   // The files timestamp matches
+   // The files timestamp matches, for non-local URLs reverify the local
+   // file, for local file, uncompress again to ensure the hashsum is still
+   // matching the Release file

    if (!Local && StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
    {
       ReverifyAfterIMS(FileName);
       return;
    }
    if (!Local && StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
    {
       ReverifyAfterIMS(FileName);
       return;
    }

-

    string decompProg;
 
    // If we enable compressed indexes, queue for hash verification
    string decompProg;
 
    // If we enable compressed indexes, queue for hash verification

diff --git a/test/integration/test-apt-update-file b/test/integration/test-apt-update-file
index 069f8ba2ff52234cc6226655111a3c89e4ac539e..e267c71da6dae5c6323daeedd3459ca4257d4f8c 100755 (executable)
--- a/test/integration/test-apt-update-file
+++ b/test/integration/test-apt-update-file
@@ -22,6 +22,13 @@ chmod 550 aptarchive/dists/unstable/main/binary-amd64
 
 testsuccess aptget update -qq
 testsuccess aptget update -qq
 
 testsuccess aptget update -qq
 testsuccess aptget update -qq

+aptget update -qq -o Debug::pkgAcquire::Auth=1 2> output.log
+
+# ensure that the hash of the uncompressed file was verified even on a local 
+# ims hit
+canary="SHA512:$(bzcat aptarchive/dists/unstable/main/binary-amd64/Packages.bz2 | sha512sum |cut -f1 -d' ')"
+grep -q "RecivedHash: $canary" output.log
+

 
 # the cleanup should still work
 chmod 750 aptarchive/dists/unstable/main/binary-amd64
 
 # the cleanup should still work
 chmod 750 aptarchive/dists/unstable/main/binary-amd64