[pypy-commit] buildbot default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r944:fb73d347aa69
Date: 2015-03-25 08:55 +0100
http://bitbucket.org/pypy/buildbot/changeset/fb73d347aa69/

Log:	merge heads

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -405,7 +405,7 @@
                    '/D', '-' + nDays, '/c', "cmd /c rmdir /q /s @path"]
     else:
         command = ['find', Interpolate(tmp_or_crazy + pytest), '-mtime',
-                   '+' + nDays, '-exec', 'rm -r', '{}', ';'] 
+                   '+' + nDays, '-exec', 'rm', '-r', '{}', ';'] 
     factory.addStep(SuccessAlways(
         description="cleanout old test files",
         command = command,
@@ -504,7 +504,7 @@
                        '/D', '-' + nDays, '/c', "cmd /c rmdir /q /s @path"]
         else:
             command = ['find', Interpolate(tmp_or_crazy + pytest), '-mtime',
-                       '+' + nDays, '-exec', 'rm -r', '{}', ';'] 
+                       '+' + nDays, '-exec', 'rm', '-r', '{}', ';'] 
         self.addStep(SuccessAlways(
             description="cleanout old test files",
             command = command,