This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=805432c0a829f99c088ae60b19a260de0526068b commit 805432c0a829f99c088ae60b19a260de0526068b Author: Guillem Jover <[email protected]> AuthorDate: Wed Oct 10 18:40:34 2012 +0200 t-conffile-replaces-upgrade: Add a second conffile This tests that not only the first conffile is properly handled. --- t-conffile-replaces-upgrade/Makefile | 2 ++ t-conffile-replaces-upgrade/pkg-conff-original/DEBIAN/conffiles | 1 + .../pkg-conff-original/test-confpath | 0 t-conffile-replaces-upgrade/pkg-conff-takeover-0/DEBIAN/conffiles | 1 + .../pkg-conff-takeover-0/test-confpath | 0 t-conffile-replaces-upgrade/pkg-conff-takeover-1/DEBIAN/conffiles | 1 + .../pkg-conff-takeover-1/test-confpath | 0 7 files changed, 5 insertions(+) diff --git a/t-conffile-replaces-upgrade/Makefile b/t-conffile-replaces-upgrade/Makefile index 846c79a67..e3a3be25a 100644 --- a/t-conffile-replaces-upgrade/Makefile +++ b/t-conffile-replaces-upgrade/Makefile @@ -13,7 +13,9 @@ define VERIFY test "`$(PKG_STATUS) pkg-conff-original`" = "install ok installed" test "`$(PKG_STATUS) pkg-conff-takeover`" = "install ok installed" test "`$(DPKG_QUERY) -S /test-conffile`" = "pkg-conff-takeover: /test-conffile" +test "`$(DPKG_QUERY) -S /test-confpath`" = "pkg-conff-takeover: /test-confpath" cmp ref-conffile /test-conffile +cmp ref-conffile /test-confpath endef test-two-run-ordered: diff --git a/t-conffile-replaces-upgrade/pkg-conff-original/DEBIAN/conffiles b/t-conffile-replaces-upgrade/pkg-conff-original/DEBIAN/conffiles index 4fad7e9dc..da1420629 100644 --- a/t-conffile-replaces-upgrade/pkg-conff-original/DEBIAN/conffiles +++ b/t-conffile-replaces-upgrade/pkg-conff-original/DEBIAN/conffiles @@ -1 +1,2 @@ /test-conffile +/test-confpath diff --git a/t-conffile-replaces-downgrade/pkg-conff-original-0/test-conffile b/t-conffile-replaces-upgrade/pkg-conff-original/test-confpath similarity index 100% copy from t-conffile-replaces-downgrade/pkg-conff-original-0/test-conffile copy to t-conffile-replaces-upgrade/pkg-conff-original/test-confpath diff --git a/t-conffile-replaces-upgrade/pkg-conff-takeover-0/DEBIAN/conffiles b/t-conffile-replaces-upgrade/pkg-conff-takeover-0/DEBIAN/conffiles index 4fad7e9dc..da1420629 100644 --- a/t-conffile-replaces-upgrade/pkg-conff-takeover-0/DEBIAN/conffiles +++ b/t-conffile-replaces-upgrade/pkg-conff-takeover-0/DEBIAN/conffiles @@ -1 +1,2 @@ /test-conffile +/test-confpath diff --git a/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/test-conffile b/t-conffile-replaces-upgrade/pkg-conff-takeover-0/test-confpath similarity index 100% copy from t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/test-conffile copy to t-conffile-replaces-upgrade/pkg-conff-takeover-0/test-confpath diff --git a/t-conffile-replaces-upgrade/pkg-conff-takeover-1/DEBIAN/conffiles b/t-conffile-replaces-upgrade/pkg-conff-takeover-1/DEBIAN/conffiles index 4fad7e9dc..da1420629 100644 --- a/t-conffile-replaces-upgrade/pkg-conff-takeover-1/DEBIAN/conffiles +++ b/t-conffile-replaces-upgrade/pkg-conff-takeover-1/DEBIAN/conffiles @@ -1 +1,2 @@ /test-conffile +/test-confpath diff --git a/t-conffile-replaces-downgrade/pkg-conff-takeover/test-conffile b/t-conffile-replaces-upgrade/pkg-conff-takeover-1/test-confpath similarity index 100% copy from t-conffile-replaces-downgrade/pkg-conff-takeover/test-conffile copy to t-conffile-replaces-upgrade/pkg-conff-takeover-1/test-confpath -- Dpkg.Org's dpkg
