[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r57: Express the master directory dependency differently.

Jeff Licquia licquia at linuxfoundation.org
Thu Jan 26 02:47:26 UTC 2012


------------------------------------------------------------
revno: 57
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Wed 2012-01-25 21:47:26 -0500
message:
  Express the master directory dependency differently.
modified:
  modules/buildbot/manifests/master.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/master.pp'
--- a/modules/buildbot/manifests/master.pp	2012-01-26 02:41:30 +0000
+++ b/modules/buildbot/manifests/master.pp	2012-01-26 02:47:26 +0000
@@ -1,14 +1,15 @@
 class buildbot::master inherits buildbot {
 
-    exec { "make bin/buildbot":
-        cwd => "/opt/buildbot",
+    exec { "make-buildbot":
+        command => "make bin/buildbot",
+        cwd     => "/opt/buildbot",
         creates => "/opt/buildbot/bin/buildbot",
         path    => [ "/bin", "/sbin", "/usr/bin", "/usr/sbin" ],
         require => File["/opt/buildbot/Makefile"],
     }
 
     exec { "make buildbot-config":
-        cwd => "/opt/buildbot",
+        cwd     => "/opt/buildbot",
         creates => "/opt/buildbot/buildbot-config",
         path    => [ "/bin", "/sbin", "/usr/bin", "/usr/sbin" ],
         require => File["/opt/buildbot/Makefile"],
@@ -18,7 +19,7 @@
         cwd     => "/opt/buildbot",
         creates => "/opt/buildbot/lsb-master",
         path    => [ "/bin", "/sbin", "/usr/bin", "/usr/sbin" ],
-        require => File["/opt/buildbot/bin/buildbot"],
+        require => Exec["make-buildbot"],
     }
 
 }



More information about the lsb-messages mailing list