[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r137: Fix package names for CentOS.
Jeff Licquia
licquia at linuxfoundation.org
Fri Feb 10 17:42:43 UTC 2012
------------------------------------------------------------
revno: 137
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Fri 2012-02-10 12:42:43 -0500
message:
Fix package names for CentOS.
modified:
modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp 2012-02-09 01:31:34 +0000
+++ b/modules/buildbot/manifests/slave.pp 2012-02-10 17:42:43 +0000
@@ -1,8 +1,9 @@
class buildbot::slave inherits buildbot {
- $lsbpkg = "$operatingsystem-$operatingsystemrelease" ? {
- /^Fedora-.+$/ => 'redhat-lsb',
- default => 'lsb',
+ $lsbpkg = $operatingsystem ? {
+ /^Fedora$/ => 'redhat-lsb',
+ /^CentOS$/ => 'redhat-lsb',
+ default => 'lsb',
}
$rpmpkg = "$operatingsystem-$operatingsystemrelease" ? {
@@ -12,9 +13,7 @@
}
$gpluspluspkg = $operatingsystem ? {
- /^SLES$/ => 'gcc-c++',
- /^OpenSuSE$/ => 'gcc-c++',
- default => 'g++',
+ default => 'gcc-c++',
}
# Here, we figure out what user and password to use to log into the
More information about the lsb-messages
mailing list