summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele OrrĂ¹ <maker@tumbolandia.net>2014-07-07 20:43:45 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2014-07-07 21:52:31 +0200
commit4f445ff78220568e0fcfa373ba1b06e0ad13e63d (patch)
tree266fcbc06adb72fe696b06907ff06c0b7d6f73a2
parent4ea471ecb013d188d03a5c3efb9b21e58ef56065 (diff)
downloadapt-4f445ff78220568e0fcfa373ba1b06e0ad13e63d.tar.gz
use exit instead of incorrect return in test wrapper
bash as sh doesn't like it, too. Git-Dch: Ignore
-rwxr-xr-xtest/integration/test-dpkg-assert-multi-arch9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/integration/test-dpkg-assert-multi-arch b/test/integration/test-dpkg-assert-multi-arch
index 177d7489..e6be6ac7 100755
--- a/test/integration/test-dpkg-assert-multi-arch
+++ b/test/integration/test-dpkg-assert-multi-arch
@@ -32,7 +32,7 @@ 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;
+ exit 2;
fi
return $*' > ./dpkg-wrapper
chmod +x ./dpkg-wrapper
@@ -68,9 +68,10 @@ touch rootdir/var/lib/dpkg/status
echo 'Dir::Bin::dpkg "./dpkg-wrapper";' > rootdir/etc/apt/apt.conf.d/99dpkgwrapper
echo '#! /bin/sh
if echo "$*" | grep -q -- "--assert-multi-arch"; then
- return 0;
-fi
-return $*' > ./dpkg-wrapper
+ exit 0
+else
+ exit 1
+fi' > ./dpkg-wrapper
testqualifier 'native-pkg' 'native-pkg:amd64'
testqualifier 'native-pkg:amd64' 'native-pkg:amd64'