Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pacman/remove.c10
-rw-r--r--src/pacman/sync.c11
2 files changed, 4 insertions, 17 deletions
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index a2269ed8..9d44cf53 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -44,14 +44,8 @@ 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) {
alpm_errno_t err = alpm_errno(config->handle);
- if(err == ALPM_ERR_TRANS_DUP_TARGET) {
- /* just skip duplicate targets */
- pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), target);
- return 0;
- } else {
- pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, alpm_strerror(err));
- return -1;
- }
+ pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, alpm_strerror(err));
+ return -1;
}
config->explicit_removes = alpm_list_add(config->explicit_removes, pkg);
return 0;
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 57677a42..2406fed5 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -521,15 +521,8 @@ static int process_pkg(alpm_pkg_t *pkg)
if(ret == -1) {
alpm_errno_t err = alpm_errno(config->handle);
- if(err == ALPM_ERR_TRANS_DUP_TARGET) {
- /* just skip duplicate targets */
- pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), alpm_pkg_get_name(pkg));
- return 0;
- } else {
- pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", alpm_pkg_get_name(pkg),
- alpm_strerror(err));
- return 1;
- }
+ pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", alpm_pkg_get_name(pkg), alpm_strerror(err));
+ return 1;
}
config->explicit_adds = alpm_list_add(config->explicit_adds, pkg);
return 0;