summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2011-08-19 02:17:04 -0400
committerDan McGee <dan@archlinux.org>2011-08-19 09:40:07 -0500
commit16334f778b59ebf831c15640db2fe9706e7c9615 (patch)
tree4cab974437d7164c27d742ac9da27ce5412e5ae3
parentc28052e45b94437d8c476c648ad6c9f9b8c04f36 (diff)
downloadpacman-16334f778b59ebf831c15640db2fe9706e7c9615.tar.xz
sync: fix garbled output in conflict prompt
$ pacman -S cronie resolving dependencies... looking for inter-conflicts... :: cronie and fcron are in conflict (@.). Remove fcron? [y/N] n $ sudo pacman -S pacman resolving dependencies... looking for inter-conflicts... :: pacman and pacman-git are in conflict (pKÈ). Remove pacman-git? [y/N] Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/sync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 11ee8175..6c30c948 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -527,7 +527,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, conflict->package2);
int doremove = 0;
QUESTION(trans, ALPM_TRANS_CONV_CONFLICT_PKG, conflict->package1,
- conflict->package2, conflict->reason, &doremove);
+ conflict->package2, conflict->reason->name, &doremove);
if(doremove) {
/* append to the removes list */
_alpm_log(handle, ALPM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2);