[pypy-svn] r59812 - pypy/build/testrunner

[fijal at codespeak.net]

Author: fijal
Date: Sat Nov  8 17:03:56 2008
New Revision: 59812

Modified:
   pypy/build/testrunner/scratchbox_runner.py
Log:
adapt hack


Modified: pypy/build/testrunner/scratchbox_runner.py
==============================================================================
--- pypy/build/testrunner/scratchbox_runner.py	(original)
+++ pypy/build/testrunner/scratchbox_runner.py	Sat Nov  8 17:03:56 2008
@@ -4,14 +4,13 @@
 """
 
 def args_for_scratchbox(cwd, args):
-    return ['/scratchbox/login', '-d', str(cwd)] + args
-
-
-def run_scratchbox(args, cwd, out, timeout=None):
     username = os.environ['HOME'].split(os.sep)[-1]
     scratchboxdir = '/scratchbox/users/%s/home/%s' % (username, username)
     if cwd.startswith(scratchboxdir):
         cwd = cwd.lstrip(scratchboxdir)
+    return ['/scratchbox/login', '-d', str(cwd)] + args
+
+def run_scratchbox(args, cwd, out, timeout=None):
     return run(args_for_scratchbox(cwd, args), cwd, out, timeout)
 
 def dry_run_scratchbox(args, cwd, out, timeout=None):