Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJudd Vinet <judd@archlinux.org>2005-12-26 06:40:29 +0000
committerJudd Vinet <judd@archlinux.org>2005-12-26 06:40:29 +0000
commit58c9d5d66387821260ba9bdd0815568039462f39 (patch)
treed2be58f9dd495c254d8fcefcc86f7fae1d1f0121 /src
parenta074ddb85b4d1f9b90842e5a4f15e2416e3147fe (diff)
applied first try at sync conflict handling (VMiklos) plus a couple changes
Diffstat (limited to 'src')
-rw-r--r--src/pacman/trans.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/pacman/trans.c b/src/pacman/trans.c
index 3f6f6bea..6a997545 100644
--- a/src/pacman/trans.c
+++ b/src/pacman/trans.c
@@ -112,6 +112,13 @@ void cb_trans_conv(unsigned char event, void *data1, void *data2, void *data3, i
(char *)alpm_pkg_getinfo(data2, PM_PKG_NAME));
*response = yesno(str);
break;
+ case PM_TRANS_CONV_CONFLICT_PKG:
+ snprintf(str, LOG_STR_LEN, "\n:: %s conflicts with %s. Remove %s? [Y/n] ",
+ (char *)data1,
+ (char *)data2,
+ (char *)data2);
+ *response = yesno(str);
+ break;
case PM_TRANS_CONV_LOCAL_NEWER:
snprintf(str, LOG_STR_LEN, ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] ",
(char *)alpm_pkg_getinfo(data1, PM_PKG_NAME),