Author: Armin Rigo <[email protected]>
Branch:
Changeset: r718:e0e5d208dfe6
Date: 2012-11-03 16:25 +0100
http://bitbucket.org/pypy/buildbot/changeset/e0e5d208dfe6/
Log: More robustly parse the stdout. Avoids being confused by warnings
like "Not trusting file xyz".
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -208,11 +208,12 @@
class CheckGotRevision(ShellCmd):
description = 'got_revision'
- command = ['hg', 'parents', '--template', '{rev}:{node}']
+ command = ['hg', 'parents', '--template', 'got_revision:{rev}:{node}']
def commandComplete(self, cmd):
if cmd.rc == 0:
got_revision = cmd.logs['stdio'].getText()
+ got_revision = got_revision.split('got_revision:')[-1]
# 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(':')
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
