diff --git a/lib/galaxy/tool_shed/metadata/metadata_generator.py b/lib/galaxy/tool_shed/metadata/metadata_generator.py index 39d40555b841..d797d1eba98c 100644 --- a/lib/galaxy/tool_shed/metadata/metadata_generator.py +++ b/lib/galaxy/tool_shed/metadata/metadata_generator.py @@ -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 diff --git a/lib/tool_shed/metadata/repository_metadata_manager.py b/lib/tool_shed/metadata/repository_metadata_manager.py index 89d26bae3015..9ec1b29271b2 100644 --- a/lib/tool_shed/metadata/repository_metadata_manager.py +++ b/lib/tool_shed/metadata/repository_metadata_manager.py @@ -208,10 +208,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. " ) @@ -221,10 +218,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