commit/galaxy-central: inithello: Fix server error when attempting to install a repository that has already been installed.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/4971f90034e8/ changeset: 4971f90034e8 user: inithello date: 2012-12-20 22:33:19 summary: Fix server error when attempting to install a repository that has already been installed. affected #: 2 files diff -r 3c4600ee9bdf65737f3c9e2bb77d6749102b98a3 -r 4971f90034e88ff9397adcc2cf406d20f09c2714 lib/galaxy/util/shed_util.py --- a/lib/galaxy/util/shed_util.py +++ b/lib/galaxy/util/shed_util.py @@ -223,6 +223,7 @@ message += "You can get the latest updates for the repository using the <b>Get updates</b> option from the repository's " message += "<b>Repository Actions</b> pop-up menu. " if len( repo_info_dicts ) == 1: + created_or_updated_tool_shed_repositories.append( installed_tool_shed_repository ) return created_or_updated_tool_shed_repositories, all_repo_info_dicts, filtered_repo_info_dicts, message else: # A tool shed repository is being installed into a Galaxy instance for the first time. We may have the case where a repository diff -r 3c4600ee9bdf65737f3c9e2bb77d6749102b98a3 -r 4971f90034e88ff9397adcc2cf406d20f09c2714 lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py --- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py @@ -1138,6 +1138,7 @@ created_or_updated_tool_shed_repositories, repo_info_dicts, filtered_repo_info_dicts, message = \ shed_util.create_repository_dependency_objects( trans, tool_path, tool_shed_url, repo_info_dicts, reinstalling=False ) if message and len( repo_info_dicts ) == 1: + installed_tool_shed_repository = created_or_updated_tool_shed_repositories[ 0 ] message+= 'Click <a href="%s">here</a> to manage the repository. ' % \ ( web.url_for( controller='admin_toolshed', action='manage_repository', id=trans.security.encode_id( installed_tool_shed_repository.id ) ) ) return trans.response.send_redirect( web.url_for( controller='admin_toolshed', 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)
-
Bitbucket