X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/514a25cbcd2babb2a9c4485fc7b9a4256b7f6ff3..503c7d594125f963b92047ad2d9d0644f39136c7:/test/integration/test-apt-get-install-deb?ds=sidebyside

diff --git a/test/integration/test-apt-get-install-deb b/test/integration/test-apt-get-install-deb
index 3f1aee5a0..3aacc301d 100755
--- a/test/integration/test-apt-get-install-deb
+++ b/test/integration/test-apt-get-install-deb
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 
 setupenvironment
 configarchitecture 'amd64' 'i386'
@@ -38,11 +38,18 @@ The following information may help to resolve the situation:
 The following packages have unmet dependencies:
  foo:i386 : Conflicts: foo but 1.0 is to be installed
  foo : Conflicts: foo:i386 but 1.0 is to be installed
-E: Unable to correct problems, you have held broken packages." aptget install ./incoming/foo_1.0_i386.deb ./incoming/foo_1.0_amd64.deb -s -q=0
+E: Unable to correct problems, you have held broken packages." aptget install ./incoming/foo_1.0_i386.deb ./incoming/foo_1.0_amd64.deb -s
 
-testdpkgnotinstalled 'foo'
+testdpkgnotinstalled 'foo' 'foo:i386'
 testsuccess aptget install ./incoming/foo_1.0_i386.deb -o Debug::pkgCacheGen=1
 testdpkginstalled 'foo:i386'
+testfailure aptget install incoming/foo_1.0_i386.deb -o Debug::pkgCacheGen=1
+cd downloaded
+testsuccess aptget install "$(readlink -f ../incoming/foo_1.0_i386.deb)" -o Debug::pkgCacheGen=1 -y --reinstall
+testfailure grep 'is already the newest version' ../rootdir/tmp/testsuccess.output
+testsuccess aptget install ../incoming/foo_1.0_i386.deb -o Debug::pkgCacheGen=1 -y --reinstall
+testfailure grep 'is already the newest version' ../rootdir/tmp/testsuccess.output
+cd ..
 
 testsuccessequal "Reading package lists...
 Building dependency tree...
@@ -55,7 +62,7 @@ The following NEW packages will be installed:
 0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
 Remv foo:i386 [1.0]
 Inst foo (1.0 local-deb [amd64])
-Conf foo (1.0 local-deb [amd64])" aptget install ./incoming/foo_1.0_amd64.deb -s -q=0
+Conf foo (1.0 local-deb [amd64])" aptget install ./incoming/foo_1.0_amd64.deb -s
 
 # Check that installing the local deb works if it is not the candidate
 echo "Package: foo
@@ -73,7 +80,7 @@ The following NEW packages will be installed:
 0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
 Remv foo:i386 [1.0]
 Inst foo (1.0 local-deb [amd64])
-Conf foo (1.0 local-deb [amd64])" aptget install ./incoming/foo_1.0_amd64.deb -s -q=0
+Conf foo (1.0 local-deb [amd64])" aptget install ./incoming/foo_1.0_amd64.deb -s
 
 createpkg() {
 	local PKG="pkg-$1"
@@ -86,6 +93,7 @@ Version: 0
 Priority: extra
 Maintainer: No Body <no@example.org>
 Architecture: all
+Depends: foo:i386
 Description: test package" >> ./incoming/$PKG/DEBIAN/control
 	if [ -n "$3" ]; then
 		echo -n "$3" >> ./incoming/$PKG/DEBIAN/control
@@ -104,13 +112,24 @@ testsuccess aptget install ./incoming/pkg-as-it-should-be_0_all.deb
 testsuccess aptget install ./incoming/pkg-leading-newline_0_all.deb
 testsuccess aptget install ./incoming/pkg-trailing-newline_0_all.deb
 
-# see if permission dropping is checked before usage
+testempty apt clean
 if [ "$(id -u)" = '0' ]; then
-	apt clean
+	# see if permission dropping is checked before usage
 	chmod 711 ./incoming
-	testsuccess aptget install -y --allow-downgrades ./incoming/pkg-as-it-should-be_0_all.deb -q=0
+	testsuccess aptget install -y ./incoming/pkg-as-it-should-be_0_all.deb --reinstall
+	testfailure grep 'is already the newest version' rootdir/tmp/testsuccess.output
 	chmod 710 ./incoming
-	testsuccesswithnotice aptget install -y --allow-downgrades ./incoming/pkg-as-it-should-be_0_all.deb -q=0
+	testsuccesswithnotice aptget install -y ./incoming/pkg-as-it-should-be_0_all.deb --reinstall
+	testfailure grep 'is already the newest version' rootdir/tmp/testsuccesswithnotice.output
 	chmod 700 ./incoming
-	testsuccesswithnotice aptget install -y --allow-downgrades ./incoming/pkg-as-it-should-be_0_all.deb -q=0
+	testsuccesswithnotice aptget install -y ./incoming/pkg-as-it-should-be_0_all.deb --reinstall
+	testfailure grep 'is already the newest version' rootdir/tmp/testsuccesswithnotice.output
+	chmod 711 ./incoming
+else
+	testsuccess aptget install -y ./incoming/pkg-as-it-should-be_0_all.deb --reinstall
+	testfailure grep 'is already the newest version' rootdir/tmp/testsuccess.output
 fi
+
+sed -i -e '/^Depends: foo/ d' rootdir/var/lib/dpkg/status
+testsuccess aptget install -y ./incoming/pkg-as-it-should-be_0_all.deb
+testfailure grep 'is already the newest version' rootdir/tmp/testsuccess.output