Merge pull request #7855 from mvdbeek/fix_workflow_extraction

[19.01] Fix workflow extraction for jobs whose JobToDatasetOutputAssociation references a discovered dataset
This commit is contained in:
Nate Coraor
2019-04-30 14:48:40 -04:00
committed by GitHub
+1 -1
View File
@@ -141,7 +141,7 @@ def extract_steps(trans, history=None, job_ids=None, dataset_ids=None, dataset_c
hid = None
for implicit_pair in jobs[job]:
query_assoc_name, dataset_collection = implicit_pair
if query_assoc_name == assoc_name:
if query_assoc_name == assoc_name or assoc_name.startswith("__new_primary_file_%s|" % query_assoc_name):
hid = dataset_collection.hid
if hid is None:
template = "Failed to find matching implicit job - job id is %s, implicit pairs are %s, assoc_name is %s."