pass --force-remove-essential to dpkg only if needed

[apt.git] / test / integration / test-apt-translation-has-no-packages

diff --git a/test/integration/test-apt-translation-has-no-packages b/test/integration/test-apt-translation-has-no-packages
index 440fd30cf706dd5fb0d8cb5b171ab01babdd79f3..3c07af3b58d99894b9416b6f2727d4ebe716acbe 100755 (executable)
--- a/test/integration/test-apt-translation-has-no-packages
+++ b/test/integration/test-apt-translation-has-no-packages
@@ -4,31 +4,25 @@
 # Translation-$lang file on disk that is actually a Packages file. In this
 # case apt used to generate invalid package versions out of the
 # Translation-$lang file (i.e. apt-cache policy foo) would show a version
 # Translation-$lang file on disk that is actually a Packages file. In this
 # case apt used to generate invalid package versions out of the
 # Translation-$lang file (i.e. apt-cache policy foo) would show a version

-# comming out of a Translation file. Downloading this versions fails as
+# coming out of a Translation file. Downloading this versions fails as

 # there is no acquire method available for the package
 #
 set -e
 
 # there is no acquire method available for the package
 #
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 
 setupenvironment
 configarchitecture "amd64"
 
 
 setupenvironment
 configarchitecture "amd64"
 

-if [ ! -x ${BUILDDIRECTORY}/apt ]; then
-    msgmsg "No ${BUILDDIRECTORY}/apt"
-    msgskip
-    exit 0
-fi
-

 buildsimplenativepackage 'foo' 'all' '1.0'
 setupaptarchive
 
 buildsimplenativepackage 'foo' 'all' '1.0'
 setupaptarchive
 

-APTARCHIVE=$(readlink -f ./aptarchive)
+APTARCHIVE="$(readlink -f ./aptarchive)"

 
 # corrupt the Translation-en file to look like a regular Packages file
 rm rootdir/var/cache/apt/*.bin
 
 # corrupt the Translation-en file to look like a regular Packages file
 rm rootdir/var/cache/apt/*.bin

-cp $APTARCHIVE/dists/unstable/main/binary-amd64/Packages \
+cp "$APTARCHIVE/dists/unstable/main/binary-amd64/Packages" \

    rootdir/var/lib/apt/lists/*Translation-en
 
 # ensure that there is no Version for the package foo generated out of
    rootdir/var/lib/apt/lists/*Translation-en
 
 # ensure that there is no Version for the package foo generated out of


@@ -37,5 +31,5 @@ testsuccessequal "foo:
   Installed: (none)
   Candidate: 1.0
   Version table:
   Installed: (none)
   Candidate: 1.0
   Version table:

-     1.0 0
-        500 file:$APTARCHIVE/ unstable/main amd64 Packages" aptcache policy foo
+     1.0 500
+        500 file:$APTARCHIVE unstable/main all Packages" aptcache policy foo