diff options
| author | Dan McGee <dan@archlinux.org> | 2011-10-22 02:29:47 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-10-22 02:29:47 +0200 |
| commit | 90ddcbe71d483884b7627237121b1dee05b07dd0 (patch) | |
| tree | 3a7ab12ede83453d24747065f5f27a78c8c51fbf /src/pacman/remove.c | |
| parent | 33bb7dbd356bd1164a1bd6418c0615808fae13f7 (diff) | |
| parent | d6e3446e70bcda9c0f28d80110d588106daa4b5c (diff) | |
| download | pacman-90ddcbe71d483884b7627237121b1dee05b07dd0.tar.gz pacman-90ddcbe71d483884b7627237121b1dee05b07dd0.tar.xz | |
Merge branch 'maint'
Conflicts:
src/pacman/package.c
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman/remove.c')
| -rw-r--r-- | src/pacman/remove.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 41957fe7..e63b5c42 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -39,7 +39,7 @@ static int remove_target(const char *target) if((pkg = alpm_db_get_pkg(db_local, target)) != NULL) { if(alpm_remove_pkg(config->handle, pkg) == -1) { - pm_fprintf(stderr, ALPM_LOG_ERROR, "'%s': %s\n", target, + pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, alpm_strerror(alpm_errno(config->handle))); return -1; } @@ -50,13 +50,13 @@ static int remove_target(const char *target) /* fallback to group */ alpm_group_t *grp = alpm_db_readgroup(db_local, target); if(grp == NULL) { - pm_fprintf(stderr, ALPM_LOG_ERROR, "'%s': target not found\n", target); + pm_printf(ALPM_LOG_ERROR, "'%s': target not found\n", target); return -1; } for(p = grp->packages; p; p = alpm_list_next(p)) { pkg = p->data; if(alpm_remove_pkg(config->handle, pkg) == -1) { - pm_fprintf(stderr, ALPM_LOG_ERROR, "'%s': %s\n", target, + pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, alpm_strerror(alpm_errno(config->handle))); return -1; } @@ -105,7 +105,7 @@ int pacman_remove(alpm_list_t *targets) /* Step 2: prepare the transaction based on its type, targets and flags */ if(alpm_trans_prepare(config->handle, &data) == -1) { enum _alpm_errno_t err = alpm_errno(config->handle); - pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), + pm_printf(ALPM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerror(err)); switch(err) { case ALPM_ERR_PKG_INVALID_ARCH: @@ -166,7 +166,7 @@ int pacman_remove(alpm_list_t *targets) } if(alpm_trans_commit(config->handle, &data) == -1) { - pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to commit transaction (%s)\n"), + pm_printf(ALPM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerror(alpm_errno(config->handle))); retval = 1; } |