|
|
@@ -14,14 +14,22 @@ setupaptarchive
|
|
|
|
|
|
testqualifier() {
|
|
|
msgtest 'Test for correct qualifier mode' $2
|
|
|
- GIVEN="$(aptget install $1 -qq -o Debug::pkgDPkgPM=1 2>&1 | grep -- '--configure' | sed -e 's/^.*--configure \([^ ]*\).*$/\1/')"
|
|
|
- test "$GIVEN" = "$2" && msgpass || msgfail
|
|
|
+ GIVEN="$(aptget install $1 -qq -o Debug::pkgDPkgPM=1 2>&1 | grep -e '--configure' -e '^dpkg:' | sed -e 's/^.*--configure \([^ ]*\).*$/\1/')"
|
|
|
+ if [ "$GIVEN" = "$2" ]; then
|
|
|
+ msgpass
|
|
|
+ else
|
|
|
+ echo
|
|
|
+ echo "$GIVEN"
|
|
|
+ msgfail
|
|
|
+ fi
|
|
|
}
|
|
|
|
|
|
# non-multiarch or "ubuntus" old multiarchified dpkg
|
|
|
echo 'Dir::Bin::dpkg "./dpkg-wrapper";' > rootdir/etc/apt/apt.conf.d/99dpkgwrapper
|
|
|
echo '#! /bin/sh
|
|
|
if echo "$*" | grep -q -- "--assert-multi-arch"; then
|
|
|
+ echo >&2 'dpkg: Fehler: unbekannte Option --assert-multi-arch'
|
|
|
+ echo >&1 'dpkg: Info: unbekannte Option --assert-multi-arch'
|
|
|
return 2;
|
|
|
fi
|
|
|
return $*' > ./dpkg-wrapper
|