Fix mergedirs() so it doesn't fail if a Directory object lacks a list…

…ing field. (#366)
common-workflow-language · Apr 13, 2017 · bc9cc74 · bc9cc74
1 parent c3e48eb
commit bc9cc74
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cwltool/process.py b/cwltool/process.py
@@ -689,8 +689,8 @@ def mergedirs(listing):
     for e in listing:
         if e["basename"] not in ents:
             ents[e["basename"]] = e
-        elif e["class"] == "Directory":
-            ents[e["basename"]]["listing"].extend(e["listing"])
+        elif e["class"] == "Directory" and e.get("listing"):
+            ents[e["basename"]].setdefault("listing", []).extend(e["listing"])
     for e in ents.itervalues():
         if e["class"] == "Directory" and "listing" in e:
             e["listing"] = mergedirs(e["listing"])