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=c66d3bf089e7bafb15f77fc0e1cf7d02c8267b34 commit c66d3bf089e7bafb15f77fc0e1cf7d02c8267b34 Author: Guillem Jover <[email protected]> AuthorDate: Mon Apr 12 15:39:02 2010 +0200 Fix t-conffile-conflict test-case The installation is supposed to fail, so make the test case expect that. --- t-conffile-conflict/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t-conffile-conflict/Makefile b/t-conffile-conflict/Makefile index 0aa18423c..7942581f4 100644 --- a/t-conffile-conflict/Makefile +++ b/t-conffile-conflict/Makefile @@ -5,9 +5,9 @@ include ../Test.mk test-case: # test if packages fail on install $(DPKG_INSTALL) pkg-conff-a.deb - $(DPKG_INSTALL) pkg-conff-b.deb + ! $(DPKG_INSTALL) pkg-conff-b.deb test-clean: - $(DPKG_PURGE) pkg-conff-b + -$(DPKG_PURGE) pkg-conff-b $(DPKG_PURGE) pkg-conff-a -- Dpkg.Org's dpkg
