From 1172b13a047d1fa96b07c7df1fd83a138432bf40 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Fri, 13 Mar 2015 13:32:54 -0400 Subject: [PATCH] Ensure that set_metadata always loads the `galaxy` module from the same version of Galaxy it is in. --- lib/galaxy_ext/metadata/set_metadata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/galaxy_ext/metadata/set_metadata.py b/lib/galaxy_ext/metadata/set_metadata.py index a3409d2929d..6f7c022ed2d 100644 --- a/lib/galaxy_ext/metadata/set_metadata.py +++ b/lib/galaxy_ext/metadata/set_metadata.py @@ -23,9 +23,9 @@ import sys # ensure supported version assert sys.version_info[:2] >= ( 2, 6 ) and sys.version_info[:2] <= ( 2, 7 ), 'Python version must be 2.6 or 2.7, this is: %s' % sys.version -new_path = [ os.path.join( os.getcwd(), "lib" ) ] -new_path.extend( sys.path[ 1: ] ) # remove scripts/ from the path -sys.path = new_path +# insert *this* galaxy before all others on sys.path +new_path = os.path.abspath( os.path.join( os.path.dirname( __file__ ), os.pardir, os.pardir ) ) +sys.path.insert( 0, new_path ) from galaxy import eggs import pkg_resources