summaryrefslogtreecommitdiff
path: root/pactest/tests/sync893.py
diff options
context:
space:
mode:
authorNagy Gabor <ngaba@bibl.u-szeged.hu>2009-08-31 23:54:51 +0200
committerDan McGee <dan@archlinux.org>2009-09-08 22:03:24 -0500
commitb7db46d610efd5f71d5e4e887fed7a3fd3b3dd86 (patch)
tree2b51620b6b0214dba6f13045dd9b25e7c9f99b44 /pactest/tests/sync893.py
parent90e3e026d1236ad89c142b427d7eeb842bbb7ff4 (diff)
downloadpacman-b7db46d610efd5f71d5e4e887fed7a3fd3b3dd86.tar.xz
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 <allan@archlinux.org> Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Diffstat (limited to 'pactest/tests/sync893.py')
-rw-r--r--pactest/tests/sync893.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pactest/tests/sync893.py b/pactest/tests/sync893.py
index 1c8494a3..e96bb7b6 100644
--- a/pactest/tests/sync893.py
+++ b/pactest/tests/sync893.py
@@ -13,7 +13,7 @@ self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
self.addpkg2db("local", lp2)
-self.args = "-S %s" % " ".join([p.name for p in sp1, sp2])
+self.args = "-S %s --ask=4" % " ".join([p.name for p in sp1, sp2])
self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_EXIST=pkg1")