[pypy-svn] buildbot default: General Windows disliking.

arigo commits-noreply at bitbucket.org
Fri Apr 29 12:10:56 CEST 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r497:07e17d302e69
Date: 2011-04-29 12:10 +0200
http://bitbucket.org/pypy/buildbot/changeset/07e17d302e69/

Log:	General Windows disliking.

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -102,11 +102,17 @@
 
 class CheckGotRevision(ShellCmd):
     description = 'got_revision'
-    command = ['hg', 'parents', '--template', '{rev}:{node|short}']
+    command = ['hg', 'parents', '--template', '{rev}:{node}']
 
     def commandComplete(self, cmd):
         if cmd.rc == 0:
             got_revision = cmd.logs['stdio'].getText()
+            # manually get the effect of {node|short} without using a
+            # '|' in the command-line, because it doesn't work on Windows
+            num = got_revision.find(':')
+            if num > 0:
+                got_revision = got_revision[:num+13]
+            #
             final_file_name = got_revision.replace(':', '-')
             # ':' should not be part of filenames --- too many issues
             self.build.setProperty('got_revision', got_revision, 'got_revision')


More information about the Pypy-commit mailing list