2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/e99b00df40b2/ Changeset: e99b00df40b2 User: Dave Bouvier Date: 2013-05-14 22:54:12 Summary: Fix for reinstalling an uninstalled repository when leaving the no changes checkbox checked and entering text into the new tool panel section field. Affected #: 2 files diff -r 6d72b2db32c0d84032ee40f2cd86b7b09485c441 -r e99b00df40b2895ee1a36d356dc5c0b968f80f8c lib/tool_shed/galaxy_install/repository_util.py --- a/lib/tool_shed/galaxy_install/repository_util.py +++ b/lib/tool_shed/galaxy_install/repository_util.py @@ -445,7 +445,8 @@ try: tool_section = trans.app.toolbox.tool_panel[ tool_panel_section_key ] except KeyError: - log.debug( 'Invalid tool_panel_section_key "%s" specified. Tools will be loaded outside of sections in the tool panel.' ) + log.debug( 'Invalid tool_panel_section_key "%s" specified. Tools will be loaded outside of sections in the tool panel.', + str( tool_panel_section_key ) ) tool_section = None else: tool_section = None diff -r 6d72b2db32c0d84032ee40f2cd86b7b09485c441 -r e99b00df40b2895ee1a36d356dc5c0b968f80f8c lib/tool_shed/util/tool_util.py --- a/lib/tool_shed/util/tool_util.py +++ b/lib/tool_shed/util/tool_util.py @@ -617,6 +617,9 @@ if 'tools' in metadata: # This forces everything to be loaded into the same section (or no section) in the tool panel. if no_changes_checked: + # Make sure the no_changes checkbox overrides the new_tool_panel_section if the user checked the checkbox and + # entered something into the field. + new_tool_panel_section = None if 'tool_panel_section' in metadata: tool_panel_dict = metadata[ 'tool_panel_section' ] if not tool_panel_dict: https://bitbucket.org/galaxy/galaxy-central/commits/d6125e3f660c/ Changeset: d6125e3f660c User: Dave Bouvier Date: 2013-05-14 22:55:16 Summary: Merge. Affected #: 1 file diff -r e99b00df40b2895ee1a36d356dc5c0b968f80f8c -r d6125e3f660caa376323218546b72e4f953dc669 lib/tool_shed/util/metadata_util.py --- a/lib/tool_shed/util/metadata_util.py +++ b/lib/tool_shed/util/metadata_util.py @@ -362,7 +362,7 @@ data_tables.append( data_table_name ) if bad_data_table: continue - data_manager_metadata_tool_file = os.path.join( relative_data_manager_dir, tool_file ) + data_manager_metadata_tool_file = os.path.normpath( os.path.join( relative_data_manager_dir, tool_file ) ) tool_metadata_tool_file = os.path.join( repo_files_directory, data_manager_metadata_tool_file ) tool = tools.get( tool_metadata_tool_file, None ) if tool is 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.