[pypy-svn] r59795 - pypy/build/bot2/pypybuildbot

[fijal at codespeak.net]

Author: fijal
Date: Sat Nov  8 14:08:08 2008
New Revision: 59795

Modified:
   pypy/build/bot2/pypybuildbot/builds.py
Log:
* use workdir for shell command
* use absolute path for svnwcrevert


Modified: pypy/build/bot2/pypybuildbot/builds.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/builds.py	(original)
+++ pypy/build/bot2/pypybuildbot/builds.py	Sat Nov  8 14:08:08 2008
@@ -15,8 +15,10 @@
 class FirstTime(shell.SetProperty):
 
     def __init__(self, **kwds):
+        workdir = kwds.pop('workdir', None)
         shell.SetProperty.__init__(self, description="first-time",
-                                   property="first-time")
+                                   property="first-time",
+                                   workdir=workdir)
 
 
 class PosixFirstTime(FirstTime):
@@ -77,7 +79,7 @@
     factory.addStep(CondShellCommand(
         description="wcrevert",
         cond=not_first_time,
-        command = ["python", "py/bin/py.svnwcrevert", 
+        command = ["python", os.path.join(os.getcwd(), "py/bin/py.svnwcrevert"), 
                    "-p.buildbot-sourcedata", "."],
         workdir = workdir,
         ))
@@ -145,7 +147,7 @@
 class PyPyTranslatedScratchboxTestFactory(factory.BuildFactory):
     def __init__(self, *a, **kw):
         USERNAME = 'buildbot'
-        WORKDIR = '/scratchbox/users/%s/home/%s/' % (USERNAME, USERNAME)
+        WORKDIR = '/scratchbox/users/%s/home/%s/build' % (USERNAME, USERNAME)
         
         factory.BuildFactory.__init__(self, *a, **kw)
         platform = kw.pop('platform', 'linux')