From 24e8f24e1e94ec3816b0bfc7a05d1c4e3f73248e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 14 Sep 2015 13:18:29 +0200 Subject: add by-hash sources.list option and document all of by-hash This changes the semantics of the option (which is renamed too) to be a yes/no value with the special additional value "force" as this allows by-hash to be disabled even if the repository indicates it would be supported and is more in line with our other yes/no options like pdiff which disable themselves if no support can be detected. The feature wasn't documented so far and hasn't reached a (un)stable release yet, so changing it without trying too hard to keep compatibility seems okay. --- test/integration/test-apt-by-hash-update | 49 ++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 15 deletions(-) (limited to 'test') diff --git a/test/integration/test-apt-by-hash-update b/test/integration/test-apt-by-hash-update index 293836861..c00ab497b 100755 --- a/test/integration/test-apt-by-hash-update +++ b/test/integration/test-apt-by-hash-update @@ -5,8 +5,9 @@ TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment -configarchitecture "i386" +configarchitecture 'i386' confighashes 'SHA512' +configcompression '.' 'gz' insertpackage 'unstable' 'foo' 'all' '1.0' @@ -24,29 +25,47 @@ mkdir -p aptarchive/dists/unstable/main/source/by-hash/SHA512 ln -s ../../Sources.gz $(sha512sum ../../Sources.gz|cut -f1 -d' ') ) -# we moved the Packages file away, normal update won't work -testfailure aptget update - -# ensure we do not know about "foo" -testfailureequal "Reading package lists... +ensureitsbroken() { + rm -rf rootdir/var/lib/apt/lists + # we moved the Packages file away, normal update won't work + testfailure aptget update "$@" + # ensure we do not know about "foo" + testfailureequal "Reading package lists... Building dependency tree... E: Unable to locate package foo" aptget install -q -s foo - -# ensure we can apt-get update by hash -testsuccess aptget update -o APT::Acquire::By-Hash=1 -o Acquire::Languages=none +} +ensureitsbroken +ensureitsbroken -o Acquire::By-Hash=1 ensureitworks() { + rm -rf rootdir/var/lib/apt/lists + testsuccess aptget update -o Acquire::Languages=none "$@" testsuccessequal "Inst foo (1.0 unstable [all]) Conf foo (1.0 unstable [all])" aptget install -qq -s foo } -ensureitworks +msgmsg 'Test by-hash via' 'config option' +ensureitworks -o Acquire::By-Hash=force +msgmsg 'Test by-hash via' 'release option' +cp -a aptarchive/dists aptarchive/dists.bak # add magic string to Release file ... -MAGIC="Acquire-By-Hash: true" -sed -i "s#Suite: unstable#Suite: unstable\n$MAGIC#" aptarchive/dists/unstable/Release +sed -i '/^Suite: / a \ +Acquire-By-Hash: yes' aptarchive/dists/unstable/Release signreleasefiles -# ... and verify that it fetches by hash now -rm -rf rootdir/var/lib/apt/lists -testsuccess aptget update -o Acquire::Languages=none +ensureitworks +ensureitsbroken -o Acquire::By-Hash=0 + +msgmsg 'Test by-hash via' 'sources option' +sed -i "s#^\(deb\(-src\)\?\) #\1 [by-hash=yes] #" rootdir/etc/apt/sources.list.d/* +ensureitworks +#ensureitsbroken -o Acquire::By-Hash=0 + +rm -rf aptarchive/dists +cp -a aptarchive/dists.bak aptarchive/dists +#ensureitworks -o Acquire::By-Hash=force +ensureitsbroken -o Acquire::By-Hash=1 +ensureitsbroken -o Acquire::By-Hash=0 +sed -i "s#^\(deb\(-src\)\?\) \[by-hash=yes\] #\1 [by-hash=force] #" rootdir/etc/apt/sources.list.d/* ensureitworks +#ensureitsbroken -o Acquire::By-Hash=0 -- cgit v1.2.3