[pypy-commit] pypy default: more of the same

[fijal]

Author: fijal
Branch: 
Changeset: r92117:85d7ced5c2a8
Date: 2017-08-09 13:24 +0200
http://bitbucket.org/pypy/pypy/changeset/85d7ced5c2a8/

Log:    more of the same

diff --git a/rpython/tool/version.py b/rpython/tool/version.py
--- a/rpython/tool/version.py
+++ b/rpython/tool/version.py
@@ -66,8 +66,8 @@
     p = Popen([str(hgexe), 'id', '-t', root],
               stdout=PIPE, stderr=PIPE, env=env)
     hgtags = [t for t in p.stdout.read().strip().split() if t != 'tip']
-    maywarn(p.stderr.read())
     if p.wait() != 0:
+        maywarn(p.stderr.read())
         hgtags = ['?']
 
     if hgtags:
@@ -77,7 +77,8 @@
         p = Popen([str(hgexe), 'id', '-b', root],
                   stdout=PIPE, stderr=PIPE, env=env)
         hgbranch = p.stdout.read().strip()
-        maywarn(p.stderr.read())
+        if p.wait() != 0:
+            maywarn(p.stderr.read())
 
         return hgbranch, hgid
 
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit