[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r52: Apply fixes from virtualenv module to bzr module.

Jeff Licquia licquia at linuxfoundation.org
Wed Jan 25 22:21:11 UTC 2012


------------------------------------------------------------
revno: 52
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Wed 2012-01-25 17:21:11 -0500
message:
  Apply fixes from virtualenv module to bzr module.
modified:
  modules/bzr/manifests/init.pp
-------------- next part --------------
=== modified file 'modules/bzr/manifests/init.pp'
--- a/modules/bzr/manifests/init.pp	2012-01-23 16:37:15 +0000
+++ b/modules/bzr/manifests/init.pp	2012-01-25 22:21:11 +0000
@@ -1,25 +1,26 @@
 class bzr {
 
+    # bzr on SLES 11 is too old; add a repository on the openSUSE
+    # Build Service for newer bzr.
+
+    $sles11obsrepo = "$operatingsystem-$operatingsystemrelease" ? {
+        /^SLES-11(\.[0-9])?$/ => File['/etc/zypp/repos.d/devel_tools_scm.repo'],
+        default               => undef,
+    }
+
     package {
         'bzr': ensure => present;
-    }
-
-    # bzr on SLES 11 is too old; add a repository on the openSUSE
-    # Build Service for newer bzr.
-
-    $skipsles11obs = "$operatingsystem-$operatingsystemrelease" ? {
-        /^SLES-11(\.[0-9])?$/ => false,
-        default               => true,
+        require => $sles11obsrepo,
     }
 
     file { "/etc/zypp/repos.d/devel_tools_scm.repo":
         noop   => $skipsles11obs,
         source => "puppet:///modules/bzr/devel_tools_scm.repo",
-        notify => Exec['refresh-zypper-keys'],
+        notify => Exec['refresh-zypper-keys-for-bzr'],
         before => Package['bzr'],
     }
 
-    exec { 'refresh-zypper-keys':
+    exec { 'refresh-zypper-keys-for-bzr':
         command     => 'zypper --gpg-auto-import-keys refresh',
         path        => [ '/usr/sbin', '/usr/bin', '/bin', '/sbin' ],
         refreshonly => true,



More information about the lsb-messages mailing list