1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/d8606b61644a/ changeset: d8606b61644a user: inithello date: 2013-01-07 22:20:23 summary: Revert fix from 8530:df20658ac499. affected #: 1 file diff -r 09cf284087021586ad08656b7ea444959c6c49bf -r d8606b61644a09719a8042efd2b23b7aa7869ff2 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 @@ -848,7 +848,8 @@ tool_section = trans.app.toolbox.tool_panel[ tool_panel_section_key ] else: tool_section = None - repo_info_dict = encoding_util.tool_shed_decode( repo_info_dict ) + if isinstance( repo_info_dict, basestring ): + repo_info_dict = encoding_util.tool_shed_decode( repo_info_dict ) # Clone each repository to the configured location. shed_util.update_tool_shed_repository_status( trans.app, tool_shed_repository, trans.model.ToolShedRepository.installation_status.CLONING ) repo_info_tuple = repo_info_dict[ tool_shed_repository.name ] @@ -1418,7 +1419,8 @@ repo_info_dicts = [] repo_info_dict = kwd.get( 'repo_info_dict', None ) if repo_info_dict: - repo_info_dict = encoding_util.tool_shed_decode( repo_info_dict ) + if isinstance( repo_info_dict, basestring ): + repo_info_dict = encoding_util.tool_shed_decode( repo_info_dict ) else: # Entering this else block used to happen only if the tool_shed_repository does not include any valid tools. After repository dependencies # were introduced, it may never happen, but we'll keep the block just in case. 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.