From d7a51997c30b2098bb60b3397095ec58ec825303 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 28 Aug 2015 19:26:44 +0200 Subject: implement PDiff patching for compressed files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some additional files like 'Contents' are very big and should therefore kept compressed on the disk, which apt-file did in the past. It also implemented pdiff patching of these files by un- and recompressing these files on-the-fly, with this commit we can do the same – but we can do this in both pdiff patching styles (client and server merging) and secured by hashes. Hashes are in so far slightly complicated as we can't compare the hashes of the compressed files as we might compress them differently than the server would (different compressor versions, options, …), so we must compare the hashes of the uncompressed content. While this commit has changes in public headers, the classes it changes are marked as hidden, so nobody can use them directly, which means the ABI break is internal only. --- test/integration/test-pdiff-usage | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'test/integration') diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index e5fe21e0f..4dc94db76 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -254,23 +254,28 @@ echo 'Debug::pkgAcquire::Diffs "true"; Debug::Acquire::Transaction "true"; Debug::pkgAcquire::rred "true";' > rootdir/etc/apt/apt.conf.d/rreddebug.conf -testrun nohash -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=1 -testrun nohash -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=1 +testcase() { + testrun nohash -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=1 "$@" + testrun nohash -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=1 "$@" -testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=1 -testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=1 -testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=0 -testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=0 + testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=1 "$@" + testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=1 "$@" + testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=0 "$@" + testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=0 "$@" -sha256sum() { - echo '01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b -' -} -testrun -o Acquire::PDiffs::Merge=0 -o Acquire::ForceHash=SHA1 -testrun -o Acquire::PDiffs::Merge=1 -o Acquire::ForceHash=SHA1 + sha256sum() { + echo '01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b -' + } + testrun -o Acquire::PDiffs::Merge=0 -o Acquire::ForceHash=SHA1 "$@" + testrun -o Acquire::PDiffs::Merge=1 -o Acquire::ForceHash=SHA1 "$@" + unset -f sha256sum -unset -f sha256sum -sha1sum() { - echo 'adc83b19e793491b1c6ea0fd8b46cd9f32e592fc -' + sha1sum() { + echo 'adc83b19e793491b1c6ea0fd8b46cd9f32e592fc -' + } + testrun -o Acquire::PDiffs::Merge=0 -o Acquire::ForceHash=SHA256 "$@" + testrun -o Acquire::PDiffs::Merge=1 -o Acquire::ForceHash=SHA256 "$@" + unset -f sha1sum } -testrun -o Acquire::PDiffs::Merge=0 -o Acquire::ForceHash=SHA256 -testrun -o Acquire::PDiffs::Merge=1 -o Acquire::ForceHash=SHA256 +testcase -o Acquire::GzipIndexes=0 +testcase -o Acquire::GzipIndexes=1 -- cgit v1.2.3