moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

remove.c: downgrade TRANS_DUP_TARGET to warning 

Matches the behavior for sync packages.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2014-05-05 22:34:15 -04:00 committed by Allan McRae
parent 00fbdabc55
commit 060d06d2f7
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pacman/remove.c
View File

@ -43,9 +43,15 @@ 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_printf(ALPM_LOG_ERROR, "'%s': %s\n", target,
alpm_strerror(alpm_errno(config->handle)));
return -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;
}
}
config->explicit_removes = alpm_list_add(config->explicit_removes, pkg);
return 0;

4
test/pacman/tests/remove001.py
View File

@ -5,5 +5,5 @@
self.args = "-R " + "foo "*5
self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_EXIST=foo")
self.addrule("PACMAN_RETCODE=0")
self.addrule("!PKG_EXIST=foo")