aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2010-09-28 18:29:57 +0000
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2010-09-28 18:29:57 +0000
commit313dab43fe97838c15fadd9e6067b0a963766c04 (patch)
tree77e5b7eeb3b2674c40675ed0537a872c0594a53d /PCbuild/build_ssl.py
parentReverted to r70917. (diff)
downloadcpython-313dab43fe97838c15fadd9e6067b0a963766c04.tar.gz
cpython-313dab43fe97838c15fadd9e6067b0a963766c04.tar.bz2
cpython-313dab43fe97838c15fadd9e6067b0a963766c04.zip
Now perl path with spaces can be used.
Diffstat (limited to 'PCbuild/build_ssl.py')
-rw-r--r--PCbuild/build_ssl.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 573bf4b84b6..4556cbcaca1 100644
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -46,7 +46,7 @@ def find_all_on_path(filename, extras = None):
# is available.
def find_working_perl(perls):
for perl in perls:
- fh = os.popen(perl + ' -e "use Win32;"')
+ fh = os.popen('"%s" -e "use Win32;"' % perl)
fh.read()
rc = fh.close()
if rc:
@@ -196,10 +196,10 @@ def main():
# as "well known" locations
perls = find_all_on_path("perl.exe", ["\\perl\\bin", "C:\\perl\\bin"])
perl = find_working_perl(perls)
- if perl is None:
+ if perl:
+ print("Found a working perl at '%s'" % (perl,))
+ else:
print("No Perl installation was found. Existing Makefiles are used.")
-
- print("Found a working perl at '%s'" % (perl,))
sys.stdout.flush()
# Look for SSL 2 levels up from pcbuild - ie, same place zlib etc all live.
ssl_dir = find_best_ssl_dir(("..\\..",))