Attachment 881933 Details for Bug 1082832 – Make blacklist/whitelist into config values.

[patch] Make blacklist/whitelist into config values.

0002-Make-blacklist-whitelist-into-config-values.patch (text/plain), 2.90 KB, created by Ralph Bean on 2014-04-02 17:58:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Bean

Created: 2014-04-02 17:58:56 UTC

Size: 2.90 KB

patch

obsolete

>From 436001ad83266308afa926759a28091765f146d9 Mon Sep 17 00:00:00 2001
>From: Ralph Bean <rbean@redhat.com>
>Date: Wed, 2 Apr 2014 13:56:46 -0400
>Subject: [PATCH 2/2] Make blacklist/whitelist into config values.
>
>---
> mash/config.py   | 13 +++++++++++++
> mash/multilib.py | 15 +++++----------
> 2 files changed, 18 insertions(+), 10 deletions(-)
>
>diff --git a/mash/config.py b/mash/config.py
>index 2b12034..9976f80 100644
>--- a/mash/config.py
>+++ b/mash/config.py
>@@ -29,6 +29,19 @@ class MashConfig(config.BaseConfig):
>     multilib = config.BoolOption(True)
>     multilib_method = config.Option('devel')
>     multilib_file = config.Option()
>+    multilib_devel_whitelist = config.ListOption()
>+    multilib_devel_blacklist = config.ListOption([
>+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
>+        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
>+        'php-devel', 'java-1.6.0-openjdk-devel',
>+        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
>+    ])
>+    multilib_runtime_whitelist = config.ListOption([
>+        'libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
>+        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
>+        'yaboot',
>+    ])
>+    multilib_runtime_blacklist = config.ListOption(['tomcat-native'])
>     arches = config.ListOption()
>     keys = config.ListOption()
>     configdir = config.Option('/etc/mash')
>diff --git a/mash/multilib.py b/mash/multilib.py
>index a9b3661..9dedc0c 100644
>--- a/mash/multilib.py
>+++ b/mash/multilib.py
>@@ -89,11 +89,9 @@ class RuntimeMultilibMethod(MultilibMethod):
> 
>     def select(self, po):
>         libdirs = [ '/usr/lib', '/usr/lib64', '/lib', '/lib64' ]
>-        blacklist = [ 'tomcat-native' ]
>-        whitelist = [ 'libgnat', 'wine', 'lmms-vst', 'nspluginwrapper', 'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb', 'yaboot' ]
>-        if po.name in blacklist:
>+        if po.name in self.config.multilib_runtime_blacklist:
>             return False
>-        if po.name in whitelist:
>+        if po.name in self.config.multilib_runtime_whitelist:
>             return True
>         if MultilibMethod.select(self,po):
>             return True
>@@ -186,14 +184,11 @@ class RuntimeMultilibMethod(MultilibMethod):
> class DevelMultilibMethod(RuntimeMultilibMethod):
>     def __init__(self, config):
>         self.name = 'devel'
>-    
>+
>     def select(self, po):
>-        blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel', 'php-devel', 'java-1.6.0-openjdk-devel',
>-                     'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel' ]
>-        whitelist = []
>-        if po.name in blacklist:
>+        if po.name in self.config.multilib_devel_blacklist:
>             return False
>-        if po.name in whitelist:
>+        if po.name in self.config.multilib_devel_whitelist:
>             return True
>         if RuntimeMultilibMethod.select(self,po):
>             return True
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1082832: 881932 | 881933