details: http://www.bx.psu.edu/hg/galaxy/rev/53de6aea6445 changeset: 3110:53de6aea6445 user: Nate Coraor nate@bx.psu.edu date: Wed Nov 18 16:18:09 2009 -0500 description: Only fix OS X platform name on 2.5, the only version on which it's broken

diffstat:

lib/galaxy/__init__.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (15 lines):

diff -r c507bad7e373 -r 53de6aea6445 lib/galaxy/__init__.py --- a/lib/galaxy/__init__.py Wed Nov 18 13:45:53 2009 -0500 +++ b/lib/galaxy/__init__.py Wed Nov 18 16:18:09 2009 -0500 @@ -12,8 +12,9 @@ import os, sys from distutils.sysconfig import get_config_vars

-if ( os.uname()[-1] in ( 'i386', 'ppc' ) and sys.platform == 'darwin' and os.path.abspath( sys.prefix ).startswith( '/System' ) ) or \ - ( sys.platform == 'darwin' and get_config_vars().get('UNIVERSALSDK', '').strip() ): +if sys.version_info[:2] == ( 2, 5 ) and \ + ( ( os.uname()[-1] in ( 'i386', 'ppc' ) and sys.platform == 'darwin' and os.path.abspath( sys.prefix ).startswith( '/System' ) ) or \ + ( sys.platform == 'darwin' and get_config_vars().get('UNIVERSALSDK', '').strip() ) ): # Has to be before anything imports pkg_resources def _get_platform_monkeypatch(): plat = distutils.util._get_platform()