diff options
| author | Allan McRae <allan@archlinux.org> | 2011-07-01 18:01:38 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-07-01 18:01:38 +0200 |
| commit | d796d1cdda15889fc0793eae50582d75f07d55d5 (patch) | |
| tree | ae48011b53d7900a2caae5123d49f644ea6dcc53 /src | |
| parent | f818f570c555668314fa9ca657fba2fe3ffd8bd4 (diff) | |
| download | pacman-d796d1cdda15889fc0793eae50582d75f07d55d5.tar.gz pacman-d796d1cdda15889fc0793eae50582d75f07d55d5.tar.xz | |
Prefix alpm_fileconflicttype_t members with ALPM
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/sync.c | 4 | ||||
| -rw-r--r-- | src/pacman/upgrade.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index ce57d3cd..03150489 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -838,11 +838,11 @@ static int sync_trans(alpm_list_t *targets) for(i = data; i; i = alpm_list_next(i)) { alpm_fileconflict_t *conflict = alpm_list_getdata(i); switch(conflict->type) { - case PM_FILECONFLICT_TARGET: + case ALPM_FILECONFLICT_TARGET: printf(_("%s exists in both '%s' and '%s'\n"), conflict->file, conflict->target, conflict->ctarget); break; - case PM_FILECONFLICT_FILESYSTEM: + case ALPM_FILECONFLICT_FILESYSTEM: printf(_("%s: %s exists in filesystem\n"), conflict->target, conflict->file); break; diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 31536a43..258db609 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -170,11 +170,11 @@ int pacman_upgrade(alpm_list_t *targets) for(i = data; i; i = alpm_list_next(i)) { alpm_fileconflict_t *conflict = alpm_list_getdata(i); switch(conflict->type) { - case PM_FILECONFLICT_TARGET: + case ALPM_FILECONFLICT_TARGET: printf(_("%s exists in both '%s' and '%s'\n"), conflict->file, conflict->target, conflict->ctarget); break; - case PM_FILECONFLICT_FILESYSTEM: + case ALPM_FILECONFLICT_FILESYSTEM: printf(_("%s: %s exists in filesystem\n"), conflict->target, conflict->file); break; |