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