diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2009-08-31 23:54:51 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-09-09 05:03:24 +0200 |
| commit | b7db46d610efd5f71d5e4e887fed7a3fd3b3dd86 (patch) | |
| tree | 2b51620b6b0214dba6f13045dd9b25e7c9f99b44 /pactest/tests/sync042.py | |
| parent | 90e3e026d1236ad89c142b427d7eeb842bbb7ff4 (diff) | |
| download | pacman-b7db46d610efd5f71d5e4e887fed7a3fd3b3dd86.tar.gz pacman-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/sync042.py')
| -rw-r--r-- | pactest/tests/sync042.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pactest/tests/sync042.py b/pactest/tests/sync042.py index 0aa7e37b..7c3498d3 100644 --- a/pactest/tests/sync042.py +++ b/pactest/tests/sync042.py @@ -9,6 +9,6 @@ self.addpkg2db("local", lp); self.args = "-S %s" % sp.name -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg1") -self.addrule("!PKG_EXIST=pkg2") +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") |