[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r539: Fix double-reference on some hosts to cairo-devel.

[Jeff Licquia]

------------------------------------------------------------
revno: 539
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Wed 2014-02-26 15:33:10 -0500
message:
  Fix double-reference on some hosts to cairo-devel.
modified:
  modules/buildbot/manifests/slavepkgs.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp	2014-02-20 17:12:34 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp	2014-02-26 20:33:10 +0000
@@ -231,7 +231,7 @@
     }
     $cairogobjectpkg = $operatingsystem ? {
         /^SLES/   => 'cairo-gobject-devel',
-        default   => 'cairo-devel',
+        default   => '',
     }
     $cupspkg = $operatingsystem ? {
         /^SLES/   => 'cups-devel',
@@ -323,7 +323,10 @@
                     'libxml2-devel', "$nsprpkg", "$nsspkg", "$pangopkg",
                     "$pngdevpkg", "$zlibpkg", "$xprotopkg", "$xrenderpkg",
                     "$kernelpkg", "$sanepkg", "$xkbpkg", 'libxslt-devel',
-                    "$tiffpkg", $cairogobjectpkg ]
+                    "$tiffpkg" ]
+    if $operatingsystem =~ /^SLES/ {
+        $devchklist += [ "$cairogobjectpkg" ]
+    }
     # end devchk
     
     # command for forcing the small-word environment