[pypy-commit] pypy py3.5: merge default into branch

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.5
Changeset: r95294:27c903e0884f
Date: 2018-11-04 22:55 -0500
http://bitbucket.org/pypy/pypy/changeset/27c903e0884f/

Log:	merge default into branch

diff --git a/rpython/translator/platform/windows.py b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -85,6 +85,9 @@
             stdout, stderr = popen.communicate()
             if popen.wait() != 0:
                 return None
+            if stdout[:5].lower() == 'error':
+                log.msg('Running "%s" errored: %s' %(vcvars, stdout.split()[0]))
+                return None
         except:
             return None