diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py index 59d6d74fd603..f70d7250bad4 100644 --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -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) diff --git a/lib/galaxy/util/__init__.py b/lib/galaxy/util/__init__.py index 005c9e07d0e8..20c113861ae1 100644 --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -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