[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r91: Fix paths when running from virtualenv, and configure Python version.

Jeff Licquia licquia at linuxfoundation.org
Sat Jan 28 17:08:55 UTC 2012


------------------------------------------------------------
revno: 91
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Sat 2012-01-28 12:08:55 -0500
message:
  Fix paths when running from virtualenv, and configure Python version.
modified:
  modules/buildbot/manifests/init.pp
  modules/buildbot/manifests/master.pp
  modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/init.pp'
--- a/modules/buildbot/manifests/init.pp	2012-01-28 15:38:55 +0000
+++ b/modules/buildbot/manifests/init.pp	2012-01-28 17:08:55 +0000
@@ -6,6 +6,11 @@
 
     $buildbotversion = '0.8.5'
 
+    $pythonversion = "$operatingsystem-$operatingsystemrelease" ? {
+        /^Fedora-16$/ => '2.7',
+        default       => '2.6',
+    }
+
     package { 'python-devel':
         ensure => present,
     }

=== modified file 'modules/buildbot/manifests/master.pp'
--- a/modules/buildbot/manifests/master.pp	2012-01-28 14:10:28 +0000
+++ b/modules/buildbot/manifests/master.pp	2012-01-28 17:08:55 +0000
@@ -3,8 +3,9 @@
     exec { "make-buildbot":
         command => "/opt/buildbot/bin/pip install buildbot==$buildbotversion",
         cwd     => "/opt/buildbot",
-        creates => "/opt/buildbot/lib/python2.6/site-packages/buildbot-$buildbotversion-py2.6.egg-info",
-        path    => [ "/bin", "/sbin", "/usr/bin", "/usr/sbin" ],
+        creates => "/opt/buildbot/lib/python$pythonversion/site-packages/buildbot-$buildbotversion-py$pythonversion.egg-info",
+        path    => [ "/opt/buildbot/bin", "/bin", "/sbin", "/usr/bin",
+                     "/usr/sbin" ],
         require => Exec["make-buildbot-virtualenv"],
     }
 
@@ -25,7 +26,8 @@
         command => "/opt/buildbot/bin/buildbot create-master /opt/buildbot/lsb-master",
         cwd     => "/opt/buildbot",
         creates => "/opt/buildbot/lsb-master/buildbot.tac",
-        path    => [ "/bin", "/sbin", "/usr/bin", "/usr/sbin" ],
+        path    => [ "/opt/buildbot/bin", "/bin", "/sbin", "/usr/bin",
+                     "/usr/sbin" ],
         user    => 'buildbot',
         require => [ Exec["make-buildbot"], File["/opt/buildbot/lsb-master"] ],
     }

=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2012-01-28 16:45:12 +0000
+++ b/modules/buildbot/manifests/slave.pp	2012-01-28 17:08:55 +0000
@@ -54,8 +54,9 @@
     exec { "make-buildslave":
         command => "/opt/buildbot/bin/pip install buildbot-slave==$buildbotversion",
         cwd     => "/opt/buildbot",
-        creates => "/opt/buildbot/lib/python2.6/site-packages/buildbot_slave-$buildbotversion-py2.6.egg-info",
-        path    => [ "/bin", "/sbin", "/usr/bin", "/usr/sbin" ],
+        creates => "/opt/buildbot/lib/python$pythonversion/site-packages/buildbot_slave-$buildbotversion-py$pythonversion.egg-info",
+        path    => [ "/opt/buildbot/bin", "/bin", "/sbin", "/usr/bin",
+                     "/usr/sbin" ],
         require => Exec["make-buildbot-virtualenv"],
     }
 
@@ -63,8 +64,8 @@
         command => "/opt/buildbot/bin/buildslave create-slave --umask=022 /opt/buildbot/lsb-slave vm1.linuxbase.org $masteruser $masterpw",
         cwd     => "/opt/buildbot",
         creates => "/opt/buildbot/lsb-slave/buildbot.tac",
-        path    => [ "/bin", "/sbin", "/usr/bin", "/usr/sbin",
-                     "/usr/local/bin", "/opt/buildbot/bin" ],
+        path    => [ "/opt/buildbot/bin", "/bin", "/sbin", "/usr/bin",
+                     "/usr/sbin", "/usr/local/bin" ],
         user    => 'buildbot',
         require => [ Exec["make-buildslave"], File["/opt/buildbot/lsb-slave"] ],
     }



More information about the lsb-messages mailing list