summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Gruber <jakob.gruber@gmail.com>2010-10-02 20:51:37 +0200
committerDan McGee <dan@archlinux.org>2010-12-30 16:35:03 +0100
commit6ddc115c7f52d6d172ca3879f96cc782bb526313 (patch)
tree25204991ce2cf281980f8aa256ab658f9ff2d884
parentdf360b791da6d4ce8bc5813d9031ce44e32fcc55 (diff)
downloadpacman-6ddc115c7f52d6d172ca3879f96cc782bb526313.tar.gz
pacman-6ddc115c7f52d6d172ca3879f96cc782bb526313.tar.xz
Respect Ignore{Pkg,Group} for group members
Fixes FS#19854. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/sync.c12
-rw-r--r--test/pacman/tests/ignore007.py2
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index a8bb4733..4cbaf0cb 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -265,6 +265,18 @@ static int sync_group(alpm_list_t *dbs_sync, const char *target)
found = 1;
for(j = alpm_grp_get_pkgs(grp); j; j = j->next) {
pmpkg_t *pkg = j->data;
+
+ /* check if group member is ignored */
+ if(_alpm_pkg_should_ignore(pkg)) {
+ int install = 0;
+ QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg,
+ NULL, NULL, &install);
+ if(install == 0) {
+ _alpm_log(PM_LOG_WARNING, _("skipping target: %s\n"), alpm_pkg_get_name(pkg));
+ continue;
+ }
+ }
+
if(sync_pkg(pkg, known_pkgs) == -1) {
if(pm_errno == PM_ERR_TRANS_DUP_TARGET || pm_errno == PM_ERR_PKG_IGNORED) {
/* just skip duplicate or ignored targets */
diff --git a/test/pacman/tests/ignore007.py b/test/pacman/tests/ignore007.py
index e4be40a1..bb5efdc9 100644
--- a/test/pacman/tests/ignore007.py
+++ b/test/pacman/tests/ignore007.py
@@ -19,5 +19,3 @@ self.addrule("PACMAN_RETCODE=0")
self.addrule("!PKG_EXIST=%s" % pkg1.name)
self.addrule("PKG_EXIST=%s" % pkg2.name)
self.addrule("PACMAN_OUTPUT=IgnorePkg")
-
-self.expectfailure = True