[Python-checkins] cpython (2.7): Issue #14018: fix merge error
ned.deily
python-checkins at python.org
Sun Jan 27 03:12:32 CET 2013
http://hg.python.org/cpython/rev/49294e55311f
changeset: 81768:49294e55311f
branch: 2.7
parent: 81765:43084fa2577c
user: Ned Deily <nad at acm.org>
date: Sat Jan 26 18:08:22 2013 -0800
summary:
Issue #14018: fix merge error
files:
setup.py | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,6 @@
"""
Returns True if 'path' can be located in an OSX SDK
"""
- return (path.startswith('/usr/') and not path.startswith('/usr/local')) or path.startswith('/System/')
return ( (path.startswith('/usr/') and not path.startswith('/usr/local'))
or path.startswith('/System/')
or path.startswith('/Library/') )
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list