From b7db46d610efd5f71d5e4e887fed7a3fd3b3dd86 Mon Sep 17 00:00:00 2001 From: Nagy Gabor Date: Mon, 31 Aug 2009 23:54:51 +0200 Subject: Do not remove conflict by default When a conflict is detected, pacman asks if the user wants to remove the conflicting package. In many cases this is a bad idea. e.g. udev conflicts with initscripts (initscripts<2009.07). Remove initscripts [Y/n] This changes the query to [y/N]. The --noconfirm behavior has been also changed, because it chooses the default answer. Since the yes answer is more interesting in our pactests dealing with conflicts, I inserted '--ask=4' to all of them with one exception: sync042.py tests the no answer. (I also fixed a typo in sync043.py) Original-work-by: Allan McRae Signed-off-by: Nagy Gabor --- pactest/tests/sync897.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pactest/tests/sync897.py') diff --git a/pactest/tests/sync897.py b/pactest/tests/sync897.py index f7bd3d71..8a1c5a7c 100644 --- a/pactest/tests/sync897.py +++ b/pactest/tests/sync897.py @@ -16,7 +16,7 @@ self.addpkg2db("local", lp2) lp3 = pmpkg("pkg3") self.addpkg2db("local", lp3) -self.args = "-Su" +self.args = "-Su --ask=4" self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_EXIST=pkg1") -- cgit v1.2.3-70-g09d2