[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r129: Do the g++ dependency in a slightly more portable way.

[Jeff Licquia]

------------------------------------------------------------
revno: 129
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Wed 2012-02-08 20:27:42 -0500
message:
  Do the g++ dependency in a slightly more portable way.
modified:
  modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2012-02-09 00:48:29 +0000
+++ b/modules/buildbot/manifests/slave.pp	2012-02-09 01:27:42 +0000
@@ -11,6 +11,12 @@
         default         => 'rpm-build',
     }
 
+    $gpluspluspkg = $operatingsystem ? {
+        /^SLES$/     => 'gcc-c++',
+        /^OpenSuSE$/ => 'gcc-c++,
+        default      => 'g++',
+    }
+
     # 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
@@ -61,7 +67,7 @@
         ensure => present,
     }
 
-    package { 'gcc-c++':
+    package { "$gpluspluspkg":
         ensure => present,
     }