diff options
| author | Tim Laszlo <tim.laszlo@gmail.com> | 2010-07-25 14:12:33 +0000 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2010-07-30 11:53:15 -0500 |
| commit | 09806826638be2c3fd3ef3888b8c4a040a57fedb (patch) | |
| tree | c3ca8ac9b70ade00e2ed0589a69b570add98f957 /src | |
| parent | 14546a375ce7b2830675ba1d64f83e06dc3bdd91 (diff) | |
| download | bcfg2-09806826638be2c3fd3ef3888b8c4a040a57fedb.tar.gz bcfg2-09806826638be2c3fd3ef3888b8c4a040a57fedb.tar.bz2 bcfg2-09806826638be2c3fd3ef3888b8c4a040a57fedb.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Plugins/Packages.py | 4 |
1 files 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 |