| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | src/pacman/sync.c | 7 | ||||
| -rw-r--r-- | test/pacman/tests/ignore006.py | 2 |
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 26f6f824..29bcf540 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -663,6 +663,13 @@ static int process_targname(alpm_list_t *dblist, char *targname) { pmpkg_t *pkg = alpm_find_dbs_satisfier(dblist, targname); + /* #FS23342 - skip ignored packages when user says no */ + if(pm_errno == PM_ERR_PKG_IGNORED) { + pm_printf(PM_LOG_WARNING, _("skipping target: %s\n"), targname); + pm_errno = 0; + return(0); + } + if(pkg) { return(process_pkg(pkg)); } diff --git a/test/pacman/tests/ignore006.py b/test/pacman/tests/ignore006.py index d80ff81f..4c1c1cac 100644 --- a/test/pacman/tests/ignore006.py +++ b/test/pacman/tests/ignore006.py @@ -6,5 +6,5 @@ self.addpkg2db("sync", pkg) self.option["IgnorePkg"] = ["package1"] self.args = "--ask=1 -S %s" % pkg.name -self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=package1") |