Mercurial > hg > autobot

changeset 54:42b82c5bb03d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix up paths for package
author Jeff Hammel <jhammel@mozilla.com>
date Mon, 10 Jan 2011 12:54:17 -0800
parents b145611fcbc1
children c2a01aae1341
files autobot/process/factory.py autobot/template/restart_buildbot.py
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/autobot/process/factory.py	Mon Jan 10 12:33:23 2011 -0800
+++ b/autobot/process/factory.py	Mon Jan 10 12:54:17 2011 -0800
@@ -48,13 +48,13 @@
     # clone hg repositories
     for hg_source in hg_sources:
       self.addStep(ShellCommand(command=['hg', 'clone', hg_source],
-                                workdir=name+'/src',
+                                workdir=WithProperties('%(virtualenv)s/src'),
                                 haltOnFailure=True))
 
     # clone the git repositories
     for git_source in git_sources:
       self.addStep(ShellCommand(command=['git', 'clone', git_source],
-                                workdir=name+'/src',
+                                workdir=WithProperties('%(virtualenv)s/src'),
                                 haltOnFailure=True))
 
 class PythonSourceFactory(VirtualenvFactory):
--- a/autobot/template/restart_buildbot.py	Mon Jan 10 12:33:23 2011 -0800
+++ b/autobot/template/restart_buildbot.py	Mon Jan 10 12:54:17 2011 -0800
@@ -12,7 +12,7 @@
 if {{debug}}:
     call(['rm', '-f', 'master/twistd.log'])
     call(['rm', '-f', 'slave/twistd.log'])
-    call(['rm', '-f', 'slave/full'])
+    call(['rm', '-rf', 'slave/full'])
 call(['buildbot', 'stop', 'master'])
 call(['buildslave', 'stop', 'slave'])
 call(['buildbot', 'start', 'master'])