Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[23.1] Workaround for XML nodes of job resource parameters losing their children #16728

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/galaxy/jobs/__init__.py
Original file line number Diff line number Diff line change
@@ -74,6 +74,7 @@
ToolEvaluator,
)
from galaxy.util import (
etree,
parse_xml_string,
RWXRWXRWX,
safe_makedirs,
@@ -641,7 +642,7 @@ def get_tool_resource_xml(self, tool_id, tool_type):
field_name, self.resource_parameters
)
raise KeyError(message)
fields.append(self.resource_parameters[field_name])
fields.append(etree.fromstring(self.resource_parameters[field_name]))

if fields:
conditional_element = parse_xml_string(self.JOB_RESOURCE_CONDITIONAL_XML)
2 changes: 1 addition & 1 deletion lib/galaxy/util/__init__.py
Original file line number Diff line number Diff line change
@@ -979,7 +979,7 @@ def parse_resource_parameters(resource_param_file):
resource_definitions_root = resource_definitions.getroot()
for parameter_elem in resource_definitions_root.findall("param"):
name = parameter_elem.get("name")
resource_parameters[name] = parameter_elem
resource_parameters[name] = etree.tostring(parameter_elem)

return resource_parameters