[PATCH] Don't multilib PHP

[Dennis Gilmore]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This needs to be looked at more. we can not remove multilibed bits from
the release trees. We may get to a place where we break peoples
installs by switching off multilib mid life. we likely need this to be
controlled by a config option we can default to having it turned off.
but allow multilib of php still in f19 and f20. 

Dennis


On Mon, 29 Sep 2014 16:54:56 +0200
Mathieu Bridon <bochecha at fedoraproject.org> wrote:

> 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'):

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJUVBkyAAoJEH7ltONmPFDR5YAP/1aUtYh89TKylP6TLu8zMxCz
LHWwPIJk6CcEo4s2fbJnKf+G2l1ygnlbOT25dPT3bPYSsIF86ISUtwuwx+DM8yCu
6tUq31LNBKujlSHjoKBc0ySA8GWNQmEBGVXTSaMc9ECRluj9E+Jxd3Xe+AcT3J+y
gaTfsJrdXOOlQ4ie7PH164cEQHl6iiUojS/7PWc6fpPbw6KH8EYVaJRU81v4fIFM
N+RBQ6Ya3uGS2KePDPM2+co1WhigKkv9Pz0ilr63tk/jfmEpi5pw4KXFp21JmAWC
9meKwR0VpKvs/IUhdrTe1Oa9TWc8TtMaOUClzhedm0Qm3ukXpJ2ziqEf0LFs8lvf
XgOL2PgsWVmxmpDj4Mv5sIEYEMMvPwcllRLDIxuYW4mJ+H2bo6seUP5DeO5VYuf5
kkBbwY+YhQ0moQjNFTSVg8p/1sutN429yLVALLe5ABM0suDnJyiRn9EcXV862ym5
bzSb1daCr4sNqJgsprx2KLgpVZXwaKAZlalf/Thi85DBiVBXWTVjDfjl4vT3urYX
EWW3RCQgIsJJ6Ft9/Rjm8uG4y1GXJHU6hJk79Vi/51r0N3sATGSoeS1LcWR2s79Q
IlIS5dNJp76RXW0oetQV0uAT2CjdT9ZbPHDL5akVx88IGIvD6rleDRnAayDamNfB
bFw2fuTCLQqpvW8+B3Ti
=td7W
-----END PGP SIGNATURE-----