[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r119: s/rpm-devel/rpm-build/ (or just rpm on SLES)
Stew Benedict
stewb at linux-foundation.org
Wed Feb 8 15:10:41 UTC 2012
------------------------------------------------------------
revno: 119
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: puppet-lsb
timestamp: Wed 2012-02-08 10:10:41 -0500
message:
s/rpm-devel/rpm-build/ (or just rpm on SLES)
modified:
modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp 2012-02-02 16:09:48 +0000
+++ b/modules/buildbot/manifests/slave.pp 2012-02-08 15:10:41 +0000
@@ -5,6 +5,11 @@
default => 'lsb',
}
+ $rpmpkg = "$operatingsystem-$operatingsystemrelease" ? {
+ /^SLES-.+$/ => 'rpm',
+ default => 'rpm-build',
+ }
+
# Here, we figure out what user and password to use to log into the
# master. This differs per-architecture. The buildbotpw module
# is pulled in from puppet-secret, and just contains Puppet variables
@@ -48,7 +53,7 @@
ensure => present,
}
- package { 'rpm-devel':
+ package { "$rpmpkg":
ensure => present,
}
More information about the lsb-messages
mailing list