summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-20 11:49:42 -0500
committerDan McGee <dan@archlinux.org>2011-03-20 11:49:42 -0500
commitb2fde01c545286bb92f6194603817602bf9dfbe7 (patch)
tree283d93f361b09fa5479bc28db6e649e3732884f7 /src
parent524b3389746f3ea44042050ba28b975b65e931ad (diff)
parent67c0e9cab39a536f1ca2fbf2a35fe898e3b71ef4 (diff)
downloadpacman-b2fde01c545286bb92f6194603817602bf9dfbe7.tar.xz
Merge branch 'maint'
Diffstat (limited to 'src')
-rw-r--r--src/pacman/sync.c7
1 files changed, 7 insertions, 0 deletions
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));
}