Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src/pacman/upgrade.c
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2011-06-28 14:33:55 +1000
committerAllan McRae <allan@archlinux.org>2011-06-28 23:28:23 +1000
commit220842b37ba484a452f5e4d8071d91d3f2b6c2d4 (patch)
treea2ceee8059e1809996c4023c8ff31ad25552fb85 /src/pacman/upgrade.c
parent6d876f9b6be055d54e50d42a34c267aad64c0b21 (diff)
Rename pmconflict_t to alpm_conflict_t
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src/pacman/upgrade.c')
-rw-r--r--src/pacman/upgrade.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c
index 67860277..1fa538da 100644
--- a/src/pacman/upgrade.c
+++ b/src/pacman/upgrade.c
@@ -118,7 +118,7 @@ int pacman_upgrade(alpm_list_t *targets)
break;
case PM_ERR_CONFLICTING_DEPS:
for(i = data; i; i = alpm_list_next(i)) {
- pmconflict_t *conflict = alpm_list_getdata(i);
+ alpm_conflict_t *conflict = alpm_list_getdata(i);
if(strcmp(conflict->package1, conflict->reason) == 0 ||
strcmp(conflict->package2, conflict->reason) == 0) {
printf(_(":: %s and %s are in conflict\n"),