X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/30ea7a60404ee53393235827202968393951d106..1a65cfc73dc67c114c6d7235bd21c1f879804f04:/test/integration/framework

diff --git a/test/integration/framework b/test/integration/framework
index 9a908a9ec..d5b68da84 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -525,18 +525,20 @@ configdpkg() {
 		local STATUSFILE="status-${BASENAME#*-}"
 		if [ -f "${TESTDIRECTORY}/${STATUSFILE}" ]; then
 			cp "${TESTDIRECTORY}/${STATUSFILE}" rootdir/var/lib/dpkg/status
+			# Add an empty line to the end if there is none
+			if tail -1 rootdir/var/lib/dpkg/status | grep -q .; then
+				echo >> rootdir/var/lib/dpkg/status
+			fi
 		else
 			echo -n > rootdir/var/lib/dpkg/status
 		fi
 	fi
 	rm -f rootdir/etc/apt/apt.conf.d/00foreigndpkg
-	# if multi-arch make sure dpkg can detect itself as capable of it
-	if getarchitectures | grep -E -q '[^ ]+ [^ ]+'; then
-		if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then
-			# dpkg doesn't really check the version as long as it is fully installed,
-			# but just to be sure we choose one above the required version
-			insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
-		fi
+	# make sure dpkg can detect itself as capable of it
+	if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then
+		# dpkg doesn't really check the version as long as it is fully installed,
+		# but just to be sure we choose one above the required version
+		insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
 	fi
 	if dpkg --assert-multi-arch >/dev/null 2>&1 ; then
 		local ARCHS="$(getarchitectures)"
@@ -813,7 +815,7 @@ buildpackage() {
 	if [ "$ARCH" = "all" ]; then
 		ARCH="$(dpkg-architecture -qDEB_HOST_ARCH 2> /dev/null)"
 	fi
-	testsuccess --nomsg dpkg-buildpackage -uc -us -a$ARCH
+	testsuccess --nomsg dpkg-buildpackage -uc -us -a$ARCH -d
 	cp "${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output" "$BUILDLOG"
 	local PKGS="$(grep '^dpkg-deb: building package' "$BUILDLOG" | cut -d'/' -f 2 | sed -e "s#'\.##")"
 	local SRCS="$(grep '^dpkg-source: info: building' "$BUILDLOG" | grep -o '[a-z0-9._+~-]*$')"