mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

- fix the OS X build failure, only try to remove the temporary file if it exists

Browse source
This commit is contained in:
doko@ubuntu.com 2012-06-30 23:28:09 +02:00
parent 7f7902ce9c
commit 4c99071c9b
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
setup.py
View file

@ -657,7 +657,7 @@ class PyBuildExt(build_ext):
ret = os.system("ldd %s > %s" % (do_readline, tmpfile)) ret = os.system("ldd %s > %s" % (do_readline, tmpfile))
else: else:
ret = 256 ret = 256
if ret == 0: if ret >> 8 == 0:
with open(tmpfile) as fp: with open(tmpfile) as fp:
for ln in fp: for ln in fp:
if 'curses' in ln: if 'curses' in ln:
@ -669,7 +669,8 @@ class PyBuildExt(build_ext):
if 'tinfo' in ln: if 'tinfo' in ln:
readline_termcap_library = 'tinfo' readline_termcap_library = 'tinfo'
break break
os.unlink(tmpfile) if os.path.exists(tmpfile):
os.unlink(tmpfile)
# Issue 7384: If readline is already linked against curses, # Issue 7384: If readline is already linked against curses,
# use the same library for the readline and curses modules. # use the same library for the readline and curses modules.
if 'curses' in readline_termcap_library: if 'curses' in readline_termcap_library: