From ea314d2f45c40a006c0104157013ab4b857f665f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 20:35:28 +0200 Subject: Adding upstream version 1.22.4. Signed-off-by: Daniel Baumann --- tests/t-conffile-divert-conffile/Makefile | 13 +++++++++++++ .../pkg-conff-divert/DEBIAN/conffiles | 1 + .../pkg-conff-divert/DEBIAN/control | 8 ++++++++ .../pkg-conff-divert/DEBIAN/postrm | 8 ++++++++ .../pkg-conff-divert/DEBIAN/preinst | 10 ++++++++++ .../pkg-conff-divert/test-conffile | 1 + tests/t-conffile-divert-conffile/pkg-conff/DEBIAN/conffiles | 1 + tests/t-conffile-divert-conffile/pkg-conff/DEBIAN/control | 8 ++++++++ tests/t-conffile-divert-conffile/pkg-conff/test-conffile | 1 + 9 files changed, 51 insertions(+) create mode 100644 tests/t-conffile-divert-conffile/Makefile create mode 100644 tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/conffiles create mode 100644 tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/control create mode 100755 tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/postrm create mode 100755 tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/preinst create mode 100644 tests/t-conffile-divert-conffile/pkg-conff-divert/test-conffile create mode 100644 tests/t-conffile-divert-conffile/pkg-conff/DEBIAN/conffiles create mode 100644 tests/t-conffile-divert-conffile/pkg-conff/DEBIAN/control create mode 100644 tests/t-conffile-divert-conffile/pkg-conff/test-conffile (limited to 'tests/t-conffile-divert-conffile') diff --git a/tests/t-conffile-divert-conffile/Makefile b/tests/t-conffile-divert-conffile/Makefile new file mode 100644 index 0000000..8cb88e4 --- /dev/null +++ b/tests/t-conffile-divert-conffile/Makefile @@ -0,0 +1,13 @@ +TESTS_DEB := pkg-conff pkg-conff-divert + +include ../Test.mk + +test-case: + $(DPKG_INSTALL) pkg-conff.deb + # test if the other package can divert the conffile w/o prompt + $(DPKG_INSTALL) pkg-conff-divert.deb + +test-clean: + $(DPKG_PURGE) pkg-conff-divert + $(DPKG_PURGE) pkg-conff + diff --git a/tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/conffiles b/tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/conffiles new file mode 100644 index 0000000..4fad7e9 --- /dev/null +++ b/tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/conffiles @@ -0,0 +1 @@ +/test-conffile diff --git a/tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/control b/tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/control new file mode 100644 index 0000000..4e72fc0 --- /dev/null +++ b/tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-conff-divert +Version: 0 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: all +Description: test package - divert a conffile + diff --git a/tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/postrm b/tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/postrm new file mode 100755 index 0000000..adf47cb --- /dev/null +++ b/tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/postrm @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +if [ "$1" = "purge" ]; then + dpkg-divert --remove --rename /test-conffile +fi + diff --git a/tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/preinst b/tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/preinst new file mode 100755 index 0000000..4ac5cfa --- /dev/null +++ b/tests/t-conffile-divert-conffile/pkg-conff-divert/DEBIAN/preinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then + # XXX: We should use the copy method instead once available. + cp -a $DPKG_ROOT/test-conffile $DPKG_ROOT/test-conffile.diverted + dpkg-divert --package pkg-conff-divert --no-rename \ + --divert /test-conffile.diverted --add /test-conffile +fi diff --git a/tests/t-conffile-divert-conffile/pkg-conff-divert/test-conffile b/tests/t-conffile-divert-conffile/pkg-conff-divert/test-conffile new file mode 100644 index 0000000..94e47d3 --- /dev/null +++ b/tests/t-conffile-divert-conffile/pkg-conff-divert/test-conffile @@ -0,0 +1 @@ +test diverted diff --git a/tests/t-conffile-divert-conffile/pkg-conff/DEBIAN/conffiles b/tests/t-conffile-divert-conffile/pkg-conff/DEBIAN/conffiles new file mode 100644 index 0000000..4fad7e9 --- /dev/null +++ b/tests/t-conffile-divert-conffile/pkg-conff/DEBIAN/conffiles @@ -0,0 +1 @@ +/test-conffile diff --git a/tests/t-conffile-divert-conffile/pkg-conff/DEBIAN/control b/tests/t-conffile-divert-conffile/pkg-conff/DEBIAN/control new file mode 100644 index 0000000..8a3a6f5 --- /dev/null +++ b/tests/t-conffile-divert-conffile/pkg-conff/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-conff +Version: 0 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: all +Description: test package - provide a conffile + diff --git a/tests/t-conffile-divert-conffile/pkg-conff/test-conffile b/tests/t-conffile-divert-conffile/pkg-conff/test-conffile new file mode 100644 index 0000000..6fbc8b5 --- /dev/null +++ b/tests/t-conffile-divert-conffile/pkg-conff/test-conffile @@ -0,0 +1 @@ +test init -- cgit v1.2.3