1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/01dd0d00de01/ Changeset: 01dd0d00de01 User: greg Date: 2013-06-21 17:56:20 Summary: Fix for generating information about a repository being installed that has no defined repository dependencies. Affected #: 1 file diff -r b5887125a2164ef4552464031d78dd783f08f06b -r 01dd0d00de0112b53c05eac5fe3ffbb6ce1526b1 lib/tool_shed/util/common_install_util.py --- a/lib/tool_shed/util/common_install_util.py +++ b/lib/tool_shed/util/common_install_util.py @@ -74,6 +74,7 @@ description, repository_clone_url, changeset_revision, ctx_rev, repository_owner, repository_dependencies, installed_td = \ suc.get_repo_info_tuple_contents( repo_info_tuple ) if repository_dependencies: + # We have a repository with one or more defined repository dependencies. missing_td = {} # Handle the scenario where a repository was installed, then uninstalled and an error occurred during the re-installation process. # In this case, a record for the repository will exist in the database with the status of 'New'. @@ -125,9 +126,13 @@ if td_key not in missing_td: missing_td[ td_key ] = td_dict else: - has_repository_dependencies = False - includes_tools = False - includes_tools_for_display_in_tool_panel = False + # We have a single repository with no defined repository dependencies. + all_repo_info_dict = get_required_repo_info_dicts( trans, tool_shed_url, util.listify( repo_info_dict ) ) + has_repository_dependencies = all_repo_info_dict.get( 'has_repository_dependencies', False ) + includes_tools_for_display_in_tool_panel = all_repo_info_dict.get( 'includes_tools_for_display_in_tool_panel', False ) + includes_tool_dependencies = all_repo_info_dict.get( 'includes_tool_dependencies', False ) + includes_tools = all_repo_info_dict.get( 'includes_tools', False ) + required_repo_info_dicts = all_repo_info_dict.get( 'all_repo_info_dicts', [] ) installed_rd = None missing_rd = None missing_td = None @@ -293,6 +298,10 @@ for components_list in val: if components_list not in required_repository_tups: required_repository_tups.append( components_list ) + else: + # We have a single repository with no dependencies. + components_list = [ tool_shed_url, repository_name, repository_owner, changeset_revision, 'False' ] + required_repository_tups.append( components_list ) if required_repository_tups: # The value of required_repository_tups is a list of tuples, so we need to encode it. encoded_required_repository_tups = [] 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.