[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r483: Set the proper package for forcing 31-bit mode on Fedora s390x.

[Jeff Licquia]

------------------------------------------------------------
revno: 483
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Wed 2013-06-12 11:52:50 -0400
message:
  Set the proper package for forcing 31-bit mode on Fedora s390x.
modified:
  modules/buildbot/manifests/slavepkgs.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp	2013-06-12 14:47:11 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp	2013-06-12 15:52:50 +0000
@@ -303,10 +303,11 @@
     # end devchk
     
     # command for forcing the small-word environment
-    $smallwordpkg = $architecture ? {
-        's390x' => 's390-32',
-        'ppc64' => 'powerpc32',
-        default => '',
+    $smallwordpkg = "$operatingsystem-$architecture" ? {
+        'SLES-s390x'   => 's390-32',
+        'Fedora-s390x' => 'util-linux',
+        /ppc64$/       => 'powerpc32',
+        default        => '',
     }
 
     # Most packages needed for a typical slave; see the definitions