diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-04-14 17:32:17 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-04-14 21:56:01 +0200 |
| commit | b2fd852459a6b9234255644730f48f071ccad64d (patch) | |
| tree | 5ea9c6b0704894b641319fbe35eee281c414a0c2 /test/integration/framework | |
| parent | 479f6fa454cd6ee9e1bc4d9ecda856d34584092e (diff) | |
silently skip acquire of empty index files
There is just no point in taking the time to acquire empty files –
especially as it will be tiny non-empty compressed files usually.
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/integration/framework b/test/integration/framework index fc59c6450..213169a98 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -566,6 +566,11 @@ forcecompressor() { local CONFFILE="${TMPWORKINGDIRECTORY}/rootdir/etc/apt/apt.conf.d/00force-compressor" echo "Acquire::CompressionTypes::Order { \"${COMPRESS}\"; }; Dir::Bin::uncompressed \"/does/not/exist\";" > "$CONFFILE" + for COMP in $(aptconfig dump 'APT::Compressor' --format '%f%n' | cut -d':' -f 5 | uniq); do + if [ -z "$COMP" -o "$COMP" = '.' -o "$COMP" = "$COMPRESSOR" ]; then continue; fi + echo "Dir::Bin::${COMP} \"/does/not/exist\";" >> "$CONFFILE" + echo "APT::Compressor::${COMP}::Name \"${COMP}-disabled\";" >> "$CONFFILE" + done } setupsimplenativepackage() { @@ -1843,6 +1848,7 @@ listcurrentlistsdirectory() { } | sort } forallsupportedcompressors() { + rm -f "${TMPWORKINGDIRECTORY}/rootdir/etc/apt/apt.conf.d/00force-compressor" for COMP in $(aptconfig dump 'APT::Compressor' --format '%f%n' | cut -d':' -f 5 | uniq); do if [ -z "$COMP" -o "$COMP" = '.' ]; then continue; fi "$@" "$COMP" |