[Python-checkins] cpython (2.7): Put the NASM pulled from svn.python.org at the front of the PATH.

[zach.ware]

https://hg.python.org/cpython/rev/50ed581fea04
changeset:   95510:50ed581fea04
branch:      2.7
parent:      95505:a6a8dd33914e
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Thu Apr 09 20:16:05 2015 -0500
summary:
  Put the NASM pulled from svn.python.org at the front of the PATH.

This will prevent failures from the version of NASM installed on buildbots,
if the ability to override the version used is desired again later, we can
figure out a way to opt in.

files:
  PCbuild/build_ssl.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -175,7 +175,8 @@
         if dir.startswith('nasm'):
             nasm_dir = os.path.join(ssl_dir, os.pardir, dir)
             nasm_dir = os.path.abspath(nasm_dir)
-            os.environ['PATH'] += os.pathsep.join(['', nasm_dir])
+            old_path = os.environ['PATH']
+            os.environ['PATH'] = os.pathsep.join([nasm_dir, old_path])
             break
     else:
         print('NASM was not found, make sure it is on PATH')

-- 
Repository URL: https://hg.python.org/cpython