1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/2ba6bd8a9d25/ Changeset: 2ba6bd8a9d25 User: greg Date: 2013-07-19 21:19:04 Summary: Enhance the change_directory action for installing tool dependencies via fabric to allow for changing the current directory to a location above the current working directory as long as the location is still within the defined working_directory. Affected #: 1 file
diff -r 5d0cfe53740b554f2643a3518ea23807dfdb26a5 -r 2ba6bd8a9d25e26ce6668c2a0219199b49e255d7 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 @@ -339,9 +339,13 @@ 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, action_dict[ 'directory' ] ) ) + target_directory = os.path.realpath( os.path.normpath( os.path.join( current_dir, action_dict[ 'directory' ] ) ) ) if target_directory.startswith( os.path.realpath( current_dir ) ) and os.path.exists( target_directory ): + # Change directory to a directory within the current working directory. dir = target_directory + elif target_directory.startswith( os.path.realpath( work_dir ) ) and os.path.exists( target_directory ): + # Change directory to a directory above the current working directory, but within the defined work_dir. + dir = target_directory.replace( os.path.realpath( work_dir ), '' ).lstrip( '/' ) 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.