[PATCH 2/2] Make blacklist/whitelist into config values.

[Ralph Bean]

---
 mash/config.py   | 14 ++++++++++++++
 mash/multilib.py | 15 +++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/mash/config.py b/mash/config.py
index e4e9b95..a6701b1 100644
--- a/mash/config.py
+++ b/mash/config.py
@@ -68,6 +68,20 @@ class MashDistroConfig(config.BaseConfig):
     multilib = config.Inherit(MashConfig.multilib)
     multilib_method = config.Inherit(MashConfig.multilib_method)
     multilib_file = config.Inherit(MashConfig.multilib_file)
+    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', 'syslinux-extlinux-nonlinux',
+        'syslinux-nonlinux', 'syslinux-tftpboot',
+    ])
+    multilib_runtime_blacklist = config.ListOption(['tomcat-native'])
     arches = config.Inherit(MashConfig.arches)
     tag = config.Option()
     inherit = config.BoolOption(True)
diff --git a/mash/multilib.py b/mash/multilib.py
index 57f53f8..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', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux', 'syslinux-tftpboot' ]
-        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.3