From cbffab246997fb5a06211dfb706b54e5ae5bb59f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 16:58:51 +0200 Subject: Adding upstream version 1.21.22. Signed-off-by: Daniel Baumann --- tests/t-file-conflicts/Makefile | 15 +++++++++++++++ tests/t-file-conflicts/pkg-a/DEBIAN/control | 8 ++++++++ tests/t-file-conflicts/pkg-a/test-conflict | 0 tests/t-file-conflicts/pkg-b/DEBIAN/control | 8 ++++++++ tests/t-file-conflicts/pkg-b/test-conflict | 0 5 files changed, 31 insertions(+) create mode 100644 tests/t-file-conflicts/Makefile create mode 100644 tests/t-file-conflicts/pkg-a/DEBIAN/control create mode 100644 tests/t-file-conflicts/pkg-a/test-conflict create mode 100644 tests/t-file-conflicts/pkg-b/DEBIAN/control create mode 100644 tests/t-file-conflicts/pkg-b/test-conflict (limited to 'tests/t-file-conflicts') diff --git a/tests/t-file-conflicts/Makefile b/tests/t-file-conflicts/Makefile new file mode 100644 index 0000000..4eeb0f5 --- /dev/null +++ b/tests/t-file-conflicts/Makefile @@ -0,0 +1,15 @@ +TESTS_DEB := pkg-a pkg-b + +include ../Test.mk + +test-case: + $(DPKG_INSTALL) pkg-a.deb + # test if the conflicting package fails on install + ! $(DPKG_INSTALL) pkg-b.deb + +test-clean: + # tell dpkg we do not want pkg-b, even if we asked for it and failed + echo pkg-b purge | $(BEROOT) $(DPKG) --set-selections + -$(DPKG_PURGE) pkg-b + $(DPKG_PURGE) pkg-a + diff --git a/tests/t-file-conflicts/pkg-a/DEBIAN/control b/tests/t-file-conflicts/pkg-a/DEBIAN/control new file mode 100644 index 0000000..7bf61bb --- /dev/null +++ b/tests/t-file-conflicts/pkg-a/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-a +Version: 0 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: all +Description: test package - conflicting file + diff --git a/tests/t-file-conflicts/pkg-a/test-conflict b/tests/t-file-conflicts/pkg-a/test-conflict new file mode 100644 index 0000000..e69de29 diff --git a/tests/t-file-conflicts/pkg-b/DEBIAN/control b/tests/t-file-conflicts/pkg-b/DEBIAN/control new file mode 100644 index 0000000..135098a --- /dev/null +++ b/tests/t-file-conflicts/pkg-b/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-b +Version: 0 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: all +Description: test package - conflicting file + diff --git a/tests/t-file-conflicts/pkg-b/test-conflict b/tests/t-file-conflicts/pkg-b/test-conflict new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3