From 03ebda088f31c7f9f7c3f2c1eb7df51befd659a2 Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Wed, 22 Sep 2021 09:04:27 +0200 Subject: [PATCH] coverage.sh: use MMDEBSTRAP_APT_CONFIG to prevent apt options (like foreign archs) leaking into the apt calls --- coverage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coverage.sh b/coverage.sh index bfdaa55..e3c2983 100755 --- a/coverage.sh +++ b/coverage.sh @@ -2844,8 +2844,8 @@ cat << END > shared/test.sh set -eu export LC_ALL=C.UTF-8 $CMD --mode=$defaultmode --variant=essential --include=apt \ - --essential-hook='apt-get -o Dir="\$1" -oDir::Etc::TrustedParts=/etc/apt/trusted.gpg.d -oAcquire::Languages=none update' \ - --essential-hook='apt-get --yes install --no-install-recommends -o Dir="\$1" -oDPkg::Chroot-Directory="\$1" apt' \ + --essential-hook='APT_CONFIG=\$MMDEBSTRAP_APT_CONFIG apt-get update' \ + --essential-hook='APT_CONFIG=\$MMDEBSTRAP_APT_CONFIG apt-get --yes install -oDPkg::Chroot-Directory="\$1" apt' \ $DEFAULT_DIST /tmp/debian-chroot.tar $mirror tar -tf /tmp/debian-chroot.tar | sort | grep -v ./var/lib/apt/extended_states | diff -u tar1.txt - rm /tmp/debian-chroot.tar