commit/galaxy-central: dannon: Tool's command might be separated by a newline, so we should use the general form split here, not specifically on spaces. Pointed out by @kellrott.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/eb28a9bcb4d9/ Changeset: eb28a9bcb4d9 User: dannon Date: 2014-10-16 23:37:30+00:00 Summary: Tool's command might be separated by a newline, so we should use the general form split here, not specifically on spaces. Pointed out by @kellrott. Affected #: 1 file diff -r d09b44c5f22839e1b87f5673bdd1615b67b3ca51 -r eb28a9bcb4d9ca99613b667300095ce8a52f7ae3 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -699,7 +699,7 @@ def load_tooldir_tag_set(self, sub_elem, elems, tool_path, integrated_elems, load_panel_dict): directory = os.path.join( tool_path, sub_elem.attrib.get("dir") ) - recursive = string_as_bool( sub_elem.attrib.get("recursive", True) ) + recursive = string_as_bool( sub_elem.attrib.get("recursive", True) ) self.__watch_directory( directory, elems, integrated_elems, load_panel_dict, recursive ) def __watch_directory( self, directory, elems, integrated_elems, load_panel_dict, recursive): @@ -825,7 +825,7 @@ tool_tup = ( os.path.abspath( tool.config_file ), os.path.split( tool.config_file )[-1] ) tarball_files.append( tool_tup ) # TODO: This feels hacky. - tool_command = tool.command.strip().split( ' ' )[0] + tool_command = tool.command.strip().split()[0] tool_path = os.path.dirname( os.path.abspath( tool.config_file ) ) # Add the tool XML to the tuple that will be used to populate the tarball. if os.path.exists( os.path.join( tool_path, tool_command ) ): 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.
participants (1)
-
commits-noreply@bitbucket.org