From 4f445ff78220568e0fcfa373ba1b06e0ad13e63d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michele=20Orr=C3=B9?= Date: Mon, 7 Jul 2014 20:43:45 +0200 Subject: use exit instead of incorrect return in test wrapper bash as sh doesn't like it, too. Git-Dch: Ignore --- test/integration/test-dpkg-assert-multi-arch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/integration/test-dpkg-assert-multi-arch b/test/integration/test-dpkg-assert-multi-arch index 177d7489b..e6be6ac7d 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' -- cgit v1.2.3