[PATCH] Don't multilib PHP

Mathieu Bridon bochecha at fedoraproject.org
Mon Sep 29 14:54:56 UTC 2014


https://bugzilla.redhat.com/show_bug.cgi?id=967477
---
 mash/multilib.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mash/multilib.py b/mash/multilib.py
index f2594b0..018e7ab 100644
--- a/mash/multilib.py
+++ b/mash/multilib.py
@@ -185,7 +185,7 @@ class DevelMultilibMethod(RuntimeMultilibMethod):
         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',
+        blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-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:
@@ -202,6 +202,8 @@ class DevelMultilibMethod(RuntimeMultilibMethod):
                     return False
                 if p_name.endswith('-devel') or p_name.endswith('-static'):
                     return True
+        if po.name.startswith('php-'):
+            return False
         if po.name.endswith('-devel'):
             return True
         if po.name.endswith('-static'):
-- 
2.1.0



More information about the rel-eng mailing list