we already have the key, use it

Author: mr-c

cwltool/job.py

@@ -515,7 +515,7 @@ def add_volumes(self,
         """Append volume mappings to the runtime option list."""
 
         container_outdir = self.builder.outdir
-        for vol in (itm[1] for itm in pathmapper.items() if itm[1].staged):
+        for key, vol in (itm for itm in pathmapper.items() if itm[1].staged):
             host_outdir_tgt = None  # type: Optional[Text]
             if vol.target.startswith(container_outdir + "/"):
                 host_outdir_tgt = os.path.join(
@@ -536,10 +536,8 @@ def add_volumes(self,
             elif vol.type in ["CreateFile", "CreateWritableFile"]:
                 new_path = self.create_file_and_add_volume(
                     runtime, vol, host_outdir_tgt, secret_store)
-                key = pathmapper.reversemap(vol.target)
-                if key:
-                    pathmapper.update(
-                        key[0], new_path, vol.target, vol.type, vol.staged)
+                pathmapper.update(
+                    key, new_path, vol.target, vol.type, vol.staged)
 
     def run(self, runtimeContext):  # type: (RuntimeContext) -> None
         if not os.path.exists(self.tmpdir):

cwltool/process.py

@@ -233,7 +233,7 @@ def stage_files(pathmapper,             # type: PathMapper
                 secret_store=None       # type: SecretStore
                ):  # type: (...) -> None
     """Link or copy files to their targets. Create them as needed."""
-    for _, entry in pathmapper.items():
+    for key, entry in pathmapper.items():
         if not entry.staged:
             continue
         if not os.path.exists(os.path.dirname(entry.target)):
@@ -275,11 +275,8 @@ def stage_files(pathmapper,             # type: PathMapper
                 os.chmod(entry.target, stat.S_IRUSR)  # Read only
             else:  # it is a "CreateWritableFile"
                 ensure_writable(entry.target)
-            key = pathmapper.reversemap(entry.target)
-            if key:
-                pathmapper.update(
-                    key[0],
-                    entry.target, entry.target, entry.type, entry.staged)
+            pathmapper.update(
+                key, entry.target, entry.target, entry.type, entry.staged)
 
 
 def relocateOutputs(outputObj,             # type: Union[Dict[Text, Any],List[Dict[Text, Any]]]