1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/f51a4898866a/
Changeset: f51a4898866a
User: Dave Bouvier
Date: 2013-06-25 16:44:27
Summary: Fix issue with change_directory action where the target folder would be
appended to the full path twice.
Affected #: 1 file
diff -r e4a8cdf0b3722bbce79a55e5ed7e70306f39885a -r
f51a4898866a51cfe93c26cf36346a4678a4ca59
lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py
--- a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py
+++ b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py
@@ -313,9 +313,8 @@
extract = action_dict.get( 'extract', False )
common_util.url_download( current_dir, filename, url,
extract=extract )
elif action_type == 'change_directory':
- target_directory = os.path.realpath( os.path.join(
current_dir, dir, action_dict[ 'directory' ] ) )
- current_working_dir = os.path.realpath( dir )
- if target_directory.startswith( current_working_dir ) and
os.path.exists( target_directory ):
+ target_directory = os.path.realpath( os.path.join(
current_dir, action_dict[ 'directory' ] ) )
+ if target_directory.startswith( os.path.realpath( current_dir
) ) and os.path.exists( target_directory ):
dir = target_directory
else:
log.error( 'Invalid or nonexistent directory %s
specified, ignoring change_directory action.', target_directory )
Repository URL:
https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from
bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.