[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r214: Avoid duplicate package definitions on Red Hat build slaves.

[Jeff Licquia]

------------------------------------------------------------
revno: 214
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Fri 2012-03-02 08:38:14 -0500
message:
  Avoid duplicate package definitions on Red Hat build slaves.
modified:
  modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2012-03-02 13:00:48 +0000
+++ b/modules/buildbot/manifests/slave.pp	2012-03-02 13:38:14 +0000
@@ -195,7 +195,11 @@
     }
 
     package { "$ucs2anypkg":
-        ensure => present,
+        # On Red Hat systems, this is the same package as $bdftocfpkg.
+        ensure => $operatingsystem ? {
+            /^(Fedora|CentOS)$/ => undef,
+            default             => present,
+        }
     }
 
     package { "$intltoolpkg":