From 09806826638be2c3fd3ef3888b8c4a040a57fedb Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Sun, 25 Jul 2010 14:12:33 +0000 Subject: Packages: Treat blacklisted packages as if they don't exist Currently a blacklisted package stops further source processing. This prevents any other sources from defining a good package. git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5987 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/Packages.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/Server/Plugins/Packages.py b/src/lib/Server/Plugins/Packages.py index b07720f6a..f327f5f94 100644 --- a/src/lib/Server/Plugins/Packages.py +++ b/src/lib/Server/Plugins/Packages.py @@ -171,8 +171,8 @@ class Source(object): ''' if requirement in self.blacklist: - # requirement and all deps are suppressed - return (set(), set()) + # Ignore blacklisted packages in this source + raise NoData if self.is_package(metadata, requirement): item_is_pkg = True -- cgit v1.2.3-1-g7c22