Mercurial > cpython-lru_cache-weakref

diff setup.py @ 62540:a3dd39e36c9d legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Ronald Oussoren <ronaldoussoren@mac.com>
date Sun, 27 Jun 2010 12:36:16 +0000
parents cb4fa3e4b8d5
children e05b646d6b98
line wrap: on
line diff
--- a/setup.py	Sun Jun 27 11:24:15 2010 +0000
+++ b/setup.py	Sun Jun 27 12:36:16 2010 +0000
@@ -47,7 +47,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,
@@ -922,6 +922,7 @@
                         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