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-08 22:03:24 -0500 |
| commit | b7db46d610efd5f71d5e4e887fed7a3fd3b3dd86 (patch) | |
| tree | 2b51620b6b0214dba6f13045dd9b25e7c9f99b44 /src | |
| parent | 90e3e026d1236ad89c142b427d7eeb842bbb7ff4 (diff) | |
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 'src')
| -rw-r--r-- | src/pacman/callback.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 05d7ed01..1dd3ffba 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -262,12 +262,12 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, /* data parameters: target package, local package, conflict (strings) */ /* print conflict only if it contains new information */ if(!strcmp(data1, data3) || !strcmp(data2, data3)) { - *response = yesno(_(":: %s and %s are in conflict. Remove %s?"), + *response = noyes(_(":: %s and %s are in conflict. Remove %s?"), (char *)data1, (char *)data2, (char *)data2); } else { - *response = yesno(_(":: %s and %s are in conflict (%s). Remove %s?"), + *response = noyes(_(":: %s and %s are in conflict (%s). Remove %s?"), (char *)data1, (char *)data2, (char *)data3, |