From 6cf823e1eff6aa37b4f7b885082f779de03b8613 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Wed, 18 Nov 2009 16:18:09 -0500 Subject: [PATCH] Only fix OS X platform name on 2.5, the only version on which it's broken --- lib/galaxy/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/__init__.py b/lib/galaxy/__init__.py index 6ba73189149..f54b209016e 100644 --- a/lib/galaxy/__init__.py +++ b/lib/galaxy/__init__.py @@ -12,8 +12,9 @@ Galaxy root package -- this is a namespace package. 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()