From 9cdf75717d2202fcae7e4cef319e3bb9ce175a71 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 04:48:09 +0200 Subject: Merging upstream version 2.9.4. Signed-off-by: Daniel Baumann --- test/integration/test-bug-612099-multiarch-conflicts | 1 + 1 file changed, 1 insertion(+) (limited to 'test/integration/test-bug-612099-multiarch-conflicts') diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts index bc57395..a005127 100755 --- a/test/integration/test-bug-612099-multiarch-conflicts +++ b/test/integration/test-bug-612099-multiarch-conflicts @@ -4,6 +4,7 @@ set -e TESTDIR="$(readlink -f "$(dirname "$0")")" . "$TESTDIR/framework" setupenvironment +allowremovemanual configarchitecture 'i386' 'amd64' buildsimplenativepackage 'libc6' 'i386' '1.0' 'stable' -- cgit v1.2.3