mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-11 20:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Two small fixes for the support for SDKs on MacOSX:

Browse source 
1) The code that checks if an path should be located in the SDK
   explicitly excludes /usr/local. This fixes issue9046

2) The SDK variant for filtering "db_dirs_to_check" in setup.py
   was not doing anything because of a missing assignment.
This commit is contained in:
Ronald Oussoren 2010-06-27 12:36:16 +00:00
parent ad72bcc864
commit cd17213e8e
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
setup.py
View file

@ -47,7 +47,7 @@ def is_macosx_sdk_path(path):
"""
Returns True if 'path' can be located in an OSX SDK
"""
return path.startswith('/usr/') or path.startswith('/System/')
return (path.startswith('/usr/') and not path.startswith('/usr/local')) or path.startswith('/System/')
def find_file(filename, std_dirs, paths):
"""Searches for the directory where a given file is located,
@ -922,6 +922,7 @@ class PyBuildExt(build_ext):
else:
if os.path.isdir(dn):
tmp.append(dn)
db_dirs_to_check = tmp
# Look for a version specific db-X.Y before an ambiguoius dbX
# XXX should we -ever- look for a dbX name? Do any