]> git.saurik.com Git - apt.git/commitdiff
use exit instead of incorrect return in test wrapper
authorMichele OrrĂ¹ <maker@tumbolandia.net>
Mon, 7 Jul 2014 18:43:45 +0000 (20:43 +0200)
committerDavid Kalnischkies <david@kalnischkies.de>
Mon, 7 Jul 2014 19:52:31 +0000 (21:52 +0200)
bash as sh doesn't like it, too.

Git-Dch: Ignore

test/integration/test-dpkg-assert-multi-arch

index 177d7489b6798424e7ffdaefbacf1528358017ea..e6be6ac7d117faccdab65e0fa6a0001748777cab 100755 (executable)
@@ -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'