Преглед изворни кода

use exit instead of incorrect return in test wrapper

bash as sh doesn't like it, too.

Git-Dch: Ignore
Michele Orrù пре 12 година
родитељ
комит
4f445ff782
1 измењених фајлова са 5 додато и 4 уклоњено
  1. 5 4
      test/integration/test-dpkg-assert-multi-arch

+ 5 - 4
test/integration/test-dpkg-assert-multi-arch

@@ -32,7 +32,7 @@ echo '#! /bin/sh
 if echo "$*" | grep -q -- "--assert-multi-arch"; then
 if echo "$*" | grep -q -- "--assert-multi-arch"; then
 	echo >&2 'dpkg: Fehler: unbekannte Option --assert-multi-arch'
 	echo >&2 'dpkg: Fehler: unbekannte Option --assert-multi-arch'
 	echo >&1 'dpkg: Info: unbekannte Option --assert-multi-arch'
 	echo >&1 'dpkg: Info: unbekannte Option --assert-multi-arch'
-	return 2;
+	exit 2;
 fi
 fi
 return $*' > ./dpkg-wrapper
 return $*' > ./dpkg-wrapper
 chmod +x ./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 'Dir::Bin::dpkg "./dpkg-wrapper";' > rootdir/etc/apt/apt.conf.d/99dpkgwrapper
 echo '#! /bin/sh
 echo '#! /bin/sh
 if echo "$*" | grep -q -- "--assert-multi-arch"; then
 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' 'native-pkg:amd64'
 testqualifier 'native-pkg:amd64' 'native-pkg:amd64'
 testqualifier 'native-pkg:amd64' 'native-pkg:amd64'