[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r92: Fix per-distro repos so they actually work right.

Jeff Licquia licquia at linuxfoundation.org
Sat Jan 28 21:53:33 UTC 2012


------------------------------------------------------------
revno: 92
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Sat 2012-01-28 16:53:33 -0500
message:
  Fix per-distro repos so they actually work right.
modified:
  modules/bzr/manifests/init.pp
  modules/python/manifests/virtualenv.pp
-------------- next part --------------
=== modified file 'modules/bzr/manifests/init.pp'
--- a/modules/bzr/manifests/init.pp	2012-01-26 02:13:29 +0000
+++ b/modules/bzr/manifests/init.pp	2012-01-28 21:53:33 +0000
@@ -13,18 +13,18 @@
         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-for-bzr'],
-        before => Package['bzr'],
-    }
+    if $sles11obsrepo {
+        file { "/etc/zypp/repos.d/devel_tools_scm.repo":
+            source => "puppet:///modules/bzr/devel_tools_scm.repo",
+            notify => Exec['refresh-zypper-keys-for-bzr'],
+        }
 
-    exec { 'refresh-zypper-keys-for-bzr':
-        command     => 'zypper --gpg-auto-import-keys refresh',
-        path        => [ '/usr/sbin', '/usr/bin', '/bin', '/sbin' ],
-        refreshonly => true,
-        logoutput   => true,
+        exec { 'refresh-zypper-keys-for-bzr':
+            command     => 'zypper --gpg-auto-import-keys refresh',
+            path        => [ '/usr/sbin', '/usr/bin', '/bin', '/sbin' ],
+            refreshonly => true,
+            logoutput   => true,
+        }
     }
 
 }

=== modified file 'modules/python/manifests/virtualenv.pp'
--- a/modules/python/manifests/virtualenv.pp	2012-01-26 02:13:29 +0000
+++ b/modules/python/manifests/virtualenv.pp	2012-01-28 21:53:33 +0000
@@ -18,16 +18,18 @@
         require => $sles11obsrepo,
     }
 
-    file { "/etc/zypp/repos.d/devel_languages_python.repo":
-        source => "puppet:///modules/python/devel_languages_python.repo",
-        notify => Exec['refresh-zypper-keys-for-python'],
-    }
+    if $sles11obsrepo {
+        file { "/etc/zypp/repos.d/devel_languages_python.repo":
+            source => "puppet:///modules/python/devel_languages_python.repo",
+            notify => Exec['refresh-zypper-keys-for-python'],
+        }
 
-    exec { 'refresh-zypper-keys-for-python':
-        command     => 'zypper --gpg-auto-import-keys refresh',
-        path        => [ '/usr/sbin', '/usr/bin', '/bin', '/sbin' ],
-        refreshonly => true,
-        logoutput   => true,
+        exec { 'refresh-zypper-keys-for-python':
+            command     => 'zypper --gpg-auto-import-keys refresh',
+            path        => [ '/usr/sbin', '/usr/bin', '/bin', '/sbin' ],
+            refreshonly => true,
+            logoutput   => true,
+        }
     }
 
 }



More information about the lsb-messages mailing list