1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ae5a239a8112/ Changeset: ae5a239a8112 User: dan Date: 2013-06-19 20:53:43 Summary: Fix for loading workflows with complex ToolShed Repositories dependencies. Affected #: 1 file diff -r fca2e3683ca13269db0c39fa9407f784508da0b5 -r ae5a239a811224a898267e38ab5255d9bf7170f5 lib/tool_shed/util/workflow_util.py --- a/lib/tool_shed/util/workflow_util.py +++ b/lib/tool_shed/util/workflow_util.py @@ -56,19 +56,19 @@ self.tool_id = tool_id self.tool = None self.errors = None - for tool_dict in tools_metadata: - if self.tool_id in [ tool_dict[ 'id' ], tool_dict[ 'guid' ] ]: - if trans.webapp.name == 'tool_shed': - # We're in the tool shed. + if trans.webapp.name == 'tool_shed': + # We're in the tool shed. + for tool_dict in tools_metadata: + if self.tool_id in [ tool_dict[ 'id' ], tool_dict[ 'guid' ] ]: repository, self.tool, message = tool_util.load_tool_from_changeset_revision( trans, repository_id, changeset_revision, tool_dict[ 'tool_config' ] ) if message and self.tool is None: self.errors = 'unavailable' break - else: - # We're in Galaxy. - self.tool = trans.app.toolbox.tools_by_id.get( self.tool_id, None ) - if self.tool is None: - self.errors = 'unavailable' + else: + # We're in Galaxy. + self.tool = trans.app.toolbox.get_tool( self.tool_id ) + if self.tool is None: + self.errors = 'unavailable' self.post_job_actions = {} self.workflow_outputs = [] self.state = None 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.