index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2009-08-31 16:20:18 +0200 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2009-09-08 21:58:52 -0500 |
commit | 12b55958d8884bd6828e0888ab9dc10d38bcd72f (patch) | |
tree | 9d39d359eec670463a3b806aa6de61154b2059e3 /src/pacman/upgrade.c | |
parent | 902dfe5900c89461e76f03a3429a867cc93fd418 (diff) |
-rw-r--r-- | src/pacman/upgrade.c | 11 |
diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index e7691185..91888fec 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -110,8 +110,15 @@ int pacman_upgrade(alpm_list_t *targets) case PM_ERR_CONFLICTING_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmconflict_t *conflict = alpm_list_getdata(i); - printf(_(":: %s: conflicts with %s\n"), - alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict)); + const char *package1 = alpm_conflict_get_package1(conflict); + const char *package2 = alpm_conflict_get_package2(conflict); + const char *reason = alpm_conflict_get_reason(conflict); + /* only print reason if it contains new information */ + if(!strcmp(package1, reason) || !strcmp(package2, reason)) { + printf(_(":: %s and %s are in conflict\n"), package1, package2); + } else { + printf(_(":: %s and %s are in conflict (%s)\n"), package1, package2, reason); + } } break; case PM_ERR_FILE_CONFLICTS: |