Commit e88859c1 authored by aknecht2's avatar aknecht2
Browse files

Updated file interpolation to use literal name instead of object. This will...

Updated file interpolation to use literal name instead of object.  This will make some edge case parsing easier in the future.
parent a53bc884
...@@ -521,7 +521,7 @@ class WorkflowJob(object): ...@@ -521,7 +521,7 @@ class WorkflowJob(object):
# Lists can only be loaded from inputs # Lists can only be loaded from inputs
add_value = [] add_value = []
for file_dict in inputs[arg_value]["values"]: for file_dict in inputs[arg_value]["values"]:
add_value.append(file_dict["file"]) add_value.append(file_dict["file"].name)
else: else:
# Conditionally load from inputs / outputs # Conditionally load from inputs / outputs
# This will only load the dict of information though, not # This will only load the dict of information though, not
...@@ -531,7 +531,7 @@ class WorkflowJob(object): ...@@ -531,7 +531,7 @@ class WorkflowJob(object):
if add_value is not None: if add_value is not None:
if arg_info["type"] in chipathlon.conf.argument_types["file"]: if arg_info["type"] in chipathlon.conf.argument_types["file"]:
# Want the actual Pegasus file obj # Want the actual Pegasus file obj
add_value = add_value.get("file") add_value = add_value.get("file").name
else: else:
# Get the actual argumnet value # Get the actual argumnet value
add_value = add_value.get("value") add_value = add_value.get("value")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment