diff options
Diffstat (limited to 'src/pacman/sync.c')
| -rw-r--r-- | src/pacman/sync.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index dd6404f7..ad6d5e5c 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -616,8 +616,8 @@ static int process_pkg(alpm_pkg_t *pkg) if(ret == -1) { enum _alpm_errno_t err = alpm_errno(config->handle); - if(err == PM_ERR_TRANS_DUP_TARGET - || err == PM_ERR_PKG_IGNORED) { + if(err == ALPM_ERR_TRANS_DUP_TARGET + || err == ALPM_ERR_PKG_IGNORED) { /* just skip duplicate or ignored targets */ pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), alpm_pkg_get_name(pkg)); return 0; @@ -681,7 +681,7 @@ static int process_targname(alpm_list_t *dblist, char *targname) alpm_pkg_t *pkg = alpm_find_dbs_satisfier(config->handle, dblist, targname); /* #FS#23342 - skip ignored packages when user says no */ - if(alpm_errno(config->handle) == PM_ERR_PKG_IGNORED) { + if(alpm_errno(config->handle) == ALPM_ERR_PKG_IGNORED) { pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), targname); /* TODO how to do this, we shouldn't be fucking with it from the frontend */ /* pm_errno = 0; */ @@ -767,13 +767,13 @@ static int sync_trans(alpm_list_t *targets) pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerror(err)); switch(err) { - case PM_ERR_PKG_INVALID_ARCH: + case ALPM_ERR_PKG_INVALID_ARCH: for(i = data; i; i = alpm_list_next(i)) { char *pkg = alpm_list_getdata(i); printf(_(":: package %s does not have a valid architecture\n"), pkg); } break; - case PM_ERR_UNSATISFIED_DEPS: + case ALPM_ERR_UNSATISFIED_DEPS: for(i = data; i; i = alpm_list_next(i)) { alpm_depmissing_t *miss = alpm_list_getdata(i); char *depstring = alpm_dep_compute_string(miss->depend); @@ -781,7 +781,7 @@ static int sync_trans(alpm_list_t *targets) free(depstring); } break; - case PM_ERR_CONFLICTING_DEPS: + case ALPM_ERR_CONFLICTING_DEPS: 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 */ @@ -834,7 +834,7 @@ static int sync_trans(alpm_list_t *targets) pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerror(err)); switch(err) { - case PM_ERR_FILE_CONFLICTS: + case ALPM_ERR_FILE_CONFLICTS: for(i = data; i; i = alpm_list_next(i)) { alpm_fileconflict_t *conflict = alpm_list_getdata(i); switch(conflict->type) { @@ -849,8 +849,8 @@ static int sync_trans(alpm_list_t *targets) } } break; - case PM_ERR_PKG_INVALID: - case PM_ERR_DLT_INVALID: + case ALPM_ERR_PKG_INVALID: + case ALPM_ERR_DLT_INVALID: for(i = data; i; i = alpm_list_next(i)) { char *filename = alpm_list_getdata(i); printf(_("%s is invalid or corrupted\n"), filename); |