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=8784827beed4c798b9782dd8ea74e6c584ffe9c2 commit 8784827beed4c798b9782dd8ea74e6c584ffe9c2 Author: Guillem Jover <[email protected]> AuthorDate: Tue Sep 8 05:54:47 2009 +0200 New t-conffile-forcenew test-case --- Makefile | 1 + t-conffile-forcenew/Makefile | 13 +++++++++++++ .../pkg-conff-forcenew-0}/DEBIAN/conffiles | 0 .../pkg-conff-forcenew-0}/DEBIAN/control | 5 +++-- .../pkg-conff-forcenew-0}/DEBIAN/postinst | 0 .../pkg-conff-forcenew-0}/test-conffile | 0 .../pkg-conff-forcenew-1}/DEBIAN/conffiles | 0 .../pkg-conff-forcenew-1}/DEBIAN/control | 5 +++-- .../pkg-conff-forcenew-1}/test-conffile | 0 .../test-conffile => t-conffile-forcenew/ref-conffile | 0 10 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 50d3630f7..87efd6b00 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ TESTS := \ t-conffile-obsolete \ t-conffile-orphan \ t-conffile-prompt \ + t-conffile-forcenew \ t-conffile-divert-normal \ t-conffile-divert-conffile \ t-conffile-conflict \ diff --git a/t-conffile-forcenew/Makefile b/t-conffile-forcenew/Makefile new file mode 100644 index 000000000..8b8b1abfc --- /dev/null +++ b/t-conffile-forcenew/Makefile @@ -0,0 +1,13 @@ +TESTS_DEB := pkg-conff-forcenew-0 pkg-conff-forcenew-1 + +include ../Test.mk + +test-case: + $(DPKG_INSTALL) pkg-conff-forcenew-0.deb + # test if we get the new conffile + $(DPKG_INSTALL) --force-confnew pkg-conff-forcenew-1.deb + cmp ref-conffile /test-conffile + +test-clean: + $(DPKG_PURGE) pkg-conff-forcenew + diff --git a/t-conffile-conflict/pkg-conff-a/DEBIAN/conffiles b/t-conffile-forcenew/pkg-conff-forcenew-0/DEBIAN/conffiles similarity index 100% copy from t-conffile-conflict/pkg-conff-a/DEBIAN/conffiles copy to t-conffile-forcenew/pkg-conff-forcenew-0/DEBIAN/conffiles diff --git a/t-conffile-divert-conffile/pkg-conff/DEBIAN/control b/t-conffile-forcenew/pkg-conff-forcenew-0/DEBIAN/control similarity index 52% copy from t-conffile-divert-conffile/pkg-conff/DEBIAN/control copy to t-conffile-forcenew/pkg-conff-forcenew-0/DEBIAN/control index 0fc64c1cd..0ef7bec9a 100644 --- a/t-conffile-divert-conffile/pkg-conff/DEBIAN/control +++ b/t-conffile-forcenew/pkg-conff-forcenew-0/DEBIAN/control @@ -1,8 +1,9 @@ -Package: pkg-conff +Package: pkg-conff-forcenew Version: 0 Section: test Priority: extra Maintainer: Guillem Jover <[email protected]> Architecture: all -Description: test package - provide a conffile +Description: test package - force-confnew behaviour + Debbug: 391818 diff --git a/t-conffile-prompt/pkg-conff-prompt-0/DEBIAN/postinst b/t-conffile-forcenew/pkg-conff-forcenew-0/DEBIAN/postinst similarity index 100% copy from t-conffile-prompt/pkg-conff-prompt-0/DEBIAN/postinst copy to t-conffile-forcenew/pkg-conff-forcenew-0/DEBIAN/postinst diff --git a/t-conffile-divert-conffile/pkg-conff/test-conffile b/t-conffile-forcenew/pkg-conff-forcenew-0/test-conffile similarity index 100% copy from t-conffile-divert-conffile/pkg-conff/test-conffile copy to t-conffile-forcenew/pkg-conff-forcenew-0/test-conffile diff --git a/t-conffile-conflict/pkg-conff-a/DEBIAN/conffiles b/t-conffile-forcenew/pkg-conff-forcenew-1/DEBIAN/conffiles similarity index 100% copy from t-conffile-conflict/pkg-conff-a/DEBIAN/conffiles copy to t-conffile-forcenew/pkg-conff-forcenew-1/DEBIAN/conffiles diff --git a/t-conffile-obsolete/pkg-conff-obsolete-1/DEBIAN/control b/t-conffile-forcenew/pkg-conff-forcenew-1/DEBIAN/control similarity index 52% copy from t-conffile-obsolete/pkg-conff-obsolete-1/DEBIAN/control copy to t-conffile-forcenew/pkg-conff-forcenew-1/DEBIAN/control index 9af88f690..e24cf3c3f 100644 --- a/t-conffile-obsolete/pkg-conff-obsolete-1/DEBIAN/control +++ b/t-conffile-forcenew/pkg-conff-forcenew-1/DEBIAN/control @@ -1,8 +1,9 @@ -Package: pkg-conff-orphan +Package: pkg-conff-forcenew Version: 1 Section: test Priority: extra Maintainer: Guillem Jover <[email protected]> Architecture: all -Description: test package - conffile orphan +Description: test package - force-confnew behaviour + Debbug: 391818 diff --git a/t-conffile-orphan/pkg-conff-takeover/test-conffile b/t-conffile-forcenew/pkg-conff-forcenew-1/test-conffile similarity index 100% copy from t-conffile-orphan/pkg-conff-takeover/test-conffile copy to t-conffile-forcenew/pkg-conff-forcenew-1/test-conffile diff --git a/t-conffile-orphan/pkg-conff-takeover/test-conffile b/t-conffile-forcenew/ref-conffile similarity index 100% copy from t-conffile-orphan/pkg-conff-takeover/test-conffile copy to t-conffile-forcenew/ref-conffile -- Dpkg.Org's dpkg
