1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/9bdc2c2e95aa/ changeset: 9bdc2c2e95aa user: greg date: 2013-01-11 22:49:36 summary: Fix for rendering tool dependencies defined for tools cotnained in tool shed repositories. affected #: 2 files diff -r 6cd4058d7b32f788e3c7484f0c5709e89cfbed0f -r 9bdc2c2e95aa05e9cc8cd01599b224e1a3c6b26e lib/galaxy/util/shed_util.py --- a/lib/galaxy/util/shed_util.py +++ b/lib/galaxy/util/shed_util.py @@ -1251,18 +1251,20 @@ old_container_tool_dependencies_root = old_container_dict[ 'tool_dependencies' ] if old_container_tool_dependencies_root: if tool_dependencies_root_folder is None: - tool_dependencies_root_folder = old_container_tool_dependencies_root - # Change the folder id so it won't confict with others being merged. - tool_dependencies_root_folder.id = folder_id + tool_dependencies_root_folder = container_util.Folder( id=folder_id, key='root', label='root', parent=None ) folder_id += 1 - tool_dependencies_folder = tool_dependencies_root_folder.folders[ 0 ] - tool_dependencies_folder.id = folder_id + tool_dependencies_folder = container_util.Folder( id=folder_id, + key='merged', + label='Tool dependencies', + parent=tool_dependencies_root_folder ) folder_id += 1 else: + td_list = [ td.listify for td in tool_dependencies_folder.tool_dependencies ] # The old_container_tool_dependencies_root will be a root folder containing a single sub_folder. old_container_tool_dependencies_folder = old_container_tool_dependencies_root.folders[ 0 ] for td in old_container_tool_dependencies_folder.tool_dependencies: - tool_dependencies_folder.tool_dependencies.append( td ) + if td.listify not in td_list: + tool_dependencies_folder.tool_dependencies.append( td ) if repository_dependencies_root_folder: repository_dependencies_root_folder.folders.append( repository_dependencies_folder ) new_containers_dict[ 'repository_dependencies' ] = repository_dependencies_root_folder diff -r 6cd4058d7b32f788e3c7484f0c5709e89cfbed0f -r 9bdc2c2e95aa05e9cc8cd01599b224e1a3c6b26e lib/galaxy/webapps/community/util/container_util.py --- a/lib/galaxy/webapps/community/util/container_util.py +++ b/lib/galaxy/webapps/community/util/container_util.py @@ -112,6 +112,9 @@ self.installation_status = installation_status self.repository_id = repository_id self.tool_dependency_id = tool_dependency_id + @property + def listify( self ): + return [ self.name, self.version, self.type ] class Workflow( object ): """Workflow object.""" 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.