[pypy-commit] pypy default: merge heads

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r95299:3e0eab4be623
Date: 2018-11-11 01:03 -0800
http://bitbucket.org/pypy/pypy/changeset/3e0eab4be623/

Log:	merge heads

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
@@ -88,6 +88,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