Merged revisions 82273 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r82273 | ronald.oussoren | 2010-06-27 14:37:46 +0200 (Sun, 27 Jun 2010) | 15 lines
Merged revisions 82272 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r82272 | ronald.oussoren | 2010-06-27 14:36:16 +0200 (Sun, 27 Jun 2010) | 8 lines
Two small fixes for the support for SDKs on MacOSX:
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.
........
................
diff --git a/setup.py b/setup.py
index 880840d..435cb53 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@
"""
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,
@@ -868,6 +868,7 @@
else:
if os.path.isdir(dn):
tmp.append(dn)
+ db_dirs_to_check = tmp
db_dirs_to_check = tmp