[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r679: Limit byacc use to CentOS 6 or earlier.

[Jeff Licquia]

------------------------------------------------------------
revno: 679
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2016-09-15 16:09:46 -0400
message:
  Limit byacc use to CentOS 6 or earlier.
modified:
  modules/buildbot/manifests/slavepkgs.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp	2014-06-03 15:52:07 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp	2016-09-15 20:09:46 +0000
@@ -121,11 +121,9 @@
     }
 
     # bison used to provide yacc for runtime-test, now it's byacc sometimes
-    $bisonpkg = $operatingsystem ? {
-        /^SLES/   => 'bison',
-        /^CentOS/ => 'byacc',
-        /^Fedora/ => 'bison',
-        default   => 'bison',
+    $bisonpkg = "${operatingsystem}-${operatingsystemrelease}" ? {
+        /^CentOS-[56]/ => 'byacc',
+        default        => 'bison',
     }
 
     # automake 1.4 is needed by the gtkvts portion of desktop-test