Skip to content

Commit

Permalink
Integrate tool_panel_section_label from PR #8 into the logic
Browse files Browse the repository at this point in the history
  • Loading branch information
afgane committed Nov 20, 2015
1 parent 0f175fd commit bfbcff5
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions files/install_tool_shed_tools.py
Expand Up @@ -492,11 +492,13 @@ def install_tools(options):
# Check if all required tool sections have been provided; if not, skip
# the installation of this tool. Note that data managers are an exception
# but they must contain string `data_manager` within the tool name.
if not tool['name'] or not tool['owner'] or (not tool['tool_panel_section_id']
if not tool['name'] or not tool['owner'] or (not (tool['tool_panel_section_id']
or tool['tool_panel_section_label'])
and 'data_manager' not in tool.get('name', '')):
log.error("Missing required tool info field; skipping [name: '{0}'; "
"owner: '{1}'; tool_panel_section_id: '{2}']"
.format(tool['name'], tool['owner'], tool['tool_panel_section_id']))
"owner: '{1}'; tool_panel_section_id: '{2}']; tool_panel_section_label: '{3}'"
.format(tool['name'], tool['owner'], tool['tool_panel_section_id'],
tool['tool_panel_section_label']))
continue
# Populate fields that can optionally be provided (if not provided, set
# defaults).
Expand Down

0 comments on commit bfbcff5

Please sign in to comment.