[Python-checkins] cpython: Fix prepare_ssl.py script

zach.ware python-checkins at python.org
Thu Apr 9 22:51:54 CEST 2015


https://hg.python.org/cpython/rev/b87aadc61fd1
changeset:   95503:b87aadc61fd1
parent:      95501:7444ac6d93c3
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Thu Apr 09 15:48:32 2015 -0500
summary:
  Fix prepare_ssl.py script

Builds using prepared sources that had Perl available anyway were broken
by the previous fix to this script (oops).

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


diff --git a/PCbuild/prepare_ssl.py b/PCbuild/prepare_ssl.py
--- a/PCbuild/prepare_ssl.py
+++ b/PCbuild/prepare_ssl.py
@@ -115,6 +115,7 @@
     """
     if not os.path.isfile(makefile):
         return
+    copy_if_different = r'$(PERL) $(SRC_D)\util\copy-if-different.pl'
     with open(makefile) as fin:
         lines = fin.readlines()
     with open(makefile, 'w') as fout:
@@ -132,9 +133,8 @@
                     if noalgo not in line:
                         line = line + noalgo
                 line = line + '\n'
-            if r'$(SRC_D)\util\copy-if-different.pl' in line:
-                line = line.replace(r'$(SRC_D)\util\copy-if-different.pl',
-                                    'copy /Y')
+            if copy_if_different in line:
+                line = line.replace(copy_if_different, 'copy /Y')
             fout.write(line)
 
 def run_configure(configure, do_script):

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


More information about the Python-checkins mailing list