summaryrefslogtreecommitdiff
path: root/src/pacman
diff options
context:
space:
mode:
Diffstat (limited to 'src/pacman')
-rw-r--r--src/pacman/add.c5
-rw-r--r--src/pacman/sync.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/src/pacman/add.c b/src/pacman/add.c
index f685cc70..7d187495 100644
--- a/src/pacman/add.c
+++ b/src/pacman/add.c
@@ -147,10 +147,9 @@ int pacman_add(alpm_list_t *targets)
break;
case PM_ERR_CONFLICTING_DEPS:
for(i = data; i; i = alpm_list_next(i)) {
- pmdepmissing_t *miss = alpm_list_getdata(i);
- pmdepend_t *dep = alpm_miss_get_dep(miss);
+ pmconflict_t *conflict = alpm_list_getdata(i);
printf(_(":: %s: conflicts with %s"),
- alpm_miss_get_target(miss), alpm_dep_get_name(dep));
+ alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict));
}
break;
case PM_ERR_FILE_CONFLICTS:
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 2d30e641..41d18a9a 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -620,10 +620,9 @@ int sync_trans(alpm_list_t *targets, int sync_only)
break;
case PM_ERR_CONFLICTING_DEPS:
for(i = data; i; i = alpm_list_next(i)) {
- pmdepmissing_t *miss = alpm_list_getdata(i);
- pmdepend_t *dep = alpm_miss_get_dep(miss);
+ pmconflict_t *conflict = alpm_list_getdata(i);
printf(_(":: %s: conflicts with %s"),
- alpm_miss_get_target(miss), alpm_dep_get_name(dep));
+ alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict));
}
break;
default: