]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
- fix the OS X build failure, only try to remove the temporary file if it exists
authordoko@ubuntu.com <doko@ubuntu.com>
Sat, 30 Jun 2012 21:28:09 +0000 (23:28 +0200)
committerdoko@ubuntu.com <doko@ubuntu.com>
Sat, 30 Jun 2012 21:28:09 +0000 (23:28 +0200)
setup.py

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