[Python-checkins] cpython (3.2): Issue #14018: fix merge error

[ned.deily]

http://hg.python.org/cpython/rev/58646b0c5226
changeset:   81769:58646b0c5226
branch:      3.2
parent:      81749:f7eda8165e6f
user:        Ned Deily <nad at acm.org>
date:        Sat Jan 26 18:09:12 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
@@ -59,7 +59,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