Skip to content

Commit

Permalink
More format fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
jmchilton committed May 19, 2023
1 parent 3490688 commit 3ea8f9c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
5 changes: 1 addition & 4 deletions lib/galaxy/tool_shed/metadata/metadata_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -1009,10 +1009,7 @@ def handle_repository_elem(self, repository_elem, only_if_compiling_contained_td
# if an installed repository cannot be found. This may not be ideal because the tool
# shed may have simply been inaccessible when metadata was being generated for the
# installed tool shed repository.
error_message = (
"Ignoring invalid repository dependency definition for tool shed %s, name %s, owner %s, "
% (toolshed, name, owner)
)
error_message = f"Ignoring invalid repository dependency definition for tool shed {toolshed}, name {name}, owner {owner}, "
error_message += f"changeset revision {changeset_revision}."
log.debug(error_message)
is_valid = False
Expand Down
10 changes: 2 additions & 8 deletions lib/tool_shed/metadata/repository_metadata_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,7 @@ def handle_repository_elem(self, repository_elem, only_if_compiling_contained_td
found = True
break
if not found:
error_message = (
"Ignoring repository dependency definition for tool shed %s, name %s, owner %s, "
% (toolshed, name, owner)
)
error_message = f"Ignoring repository dependency definition for tool shed {toolshed}, name {name}, owner {owner}, "
error_message += (
f"changeset revision {changeset_revision} because the changeset revision is invalid. "
)
Expand All @@ -220,10 +217,7 @@ def handle_repository_elem(self, repository_elem, only_if_compiling_contained_td
else:
# Repository dependencies are currently supported within a single tool shed.
error_message = "Repository dependencies are currently supported only within the same tool shed. Ignoring "
error_message += (
"repository dependency definition for tool shed %s, name %s, owner %s, changeset revision %s. "
% (toolshed, name, owner, changeset_revision)
)
error_message += f"repository dependency definition for tool shed {toolshed}, name {name}, owner {owner}, changeset revision {changeset_revision}. "
log.debug(error_message)
is_valid = False
return repository_dependency_tup, is_valid, error_message
Expand Down

0 comments on commit 3ea8f9c

Please sign in to comment.