Skip to content

Commit

Permalink
Merge branch 'release_24.0' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mvdbeek committed Apr 10, 2024
2 parents 4dcf0cc + 6700809 commit c7cb47a
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions lib/galaxy/managers/workflows.py
Original file line number Diff line number Diff line change
Expand Up @@ -1460,12 +1460,11 @@ def _workflow_to_dict_export(self, trans, stored=None, workflow=None, internal=F
if not annotation_str and annotation_owner:
annotation_str = self.get_item_annotation_str(trans.sa_session, annotation_owner, step) or ""
content_id = module.get_content_id() if allow_upgrade else step.content_id
errors = {}
try:
tool_state = module.get_export_state()
except ValueError:
# Fix state if necessary
errors = module.check_and_update_state()
module.check_and_update_state()
tool_state = module.get_export_state()

# Step info
Expand All @@ -1477,7 +1476,7 @@ def _workflow_to_dict_export(self, trans, stored=None, workflow=None, internal=F
"tool_version": module.get_version() if allow_upgrade else step.tool_version,
"name": module.get_name(),
"tool_state": json.dumps(tool_state),
"errors": errors or module.get_errors(),
"errors": module.get_errors(),
"uuid": str(step.uuid),
"label": step.label or None,
"annotation": annotation_str,
Expand Down

0 comments on commit c7cb47a

Please sign in to comment.