--- mash-0.1.18/mash/multilib.py 2007-06-21 12:29:30.000000000 -0400
+++ mash/mash/multilib.py 2007-09-06 10:23:04.000000000 -0400
@@ -87,18 +109,18 @@
self.name = 'devel'
def select(self, po):
- blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel']
+ blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel' ]
whitelist = ['perl']
if po.name in blacklist:
return False
- if po.name.startswith('kernel'):
- for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:
- if p_name == 'kernel-devel':
- return False
if po.name in whitelist:
return True
if RuntimeMultilibMethod.select(self,po):
return True
+ if po.name.startswith('kernel'):
+ for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:
+ if p_name == 'kernel-devel':
+ return False
if po.name.endswith('-devel'):
return True
return False