diff options
Diffstat (limited to 'src/pacman/sync.c')
| -rw-r--r-- | src/pacman/sync.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 7b50d805..ea32a264 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -779,13 +779,14 @@ int sync_prepare_execute(void) for(i = data; i; i = alpm_list_next(i)) { alpm_conflict_t *conflict = alpm_list_getdata(i); /* only print reason if it contains new information */ - if(strcmp(conflict->package1, conflict->reason) == 0 || - strcmp(conflict->package2, conflict->reason) == 0) { + if(conflict->reason->mod == ALPM_DEP_MOD_ANY) { printf(_(":: %s and %s are in conflict\n"), conflict->package1, conflict->package2); } else { + char *reason = alpm_dep_compute_string(conflict->reason); printf(_(":: %s and %s are in conflict (%s)\n"), - conflict->package1, conflict->package2, conflict->reason); + conflict->package1, conflict->package2, reason); + free(reason); } } break; |