[ARVADOS] created: ffd559e0f44db06078ebac97d306548ee911fde8

[Git user]

        at  ffd559e0f44db06078ebac97d306548ee911fde8 (commit)


commit ffd559e0f44db06078ebac97d306548ee911fde8
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Sep 12 16:58:33 2017 -0400

    12248: Bugfix reversemap.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/pathmapper.py b/sdk/cwl/arvados_cwl/pathmapper.py
index 5a2d814..c8ae77a 100644
--- a/sdk/cwl/arvados_cwl/pathmapper.py
+++ b/sdk/cwl/arvados_cwl/pathmapper.py
@@ -195,12 +195,16 @@ class ArvPathMapper(PathMapper):
         self.keepdir = None
 
     def reversemap(self, target):
-        if target.startswith("keep:"):
+        p = super(ArvPathMapper, self).reversemap(target)
+        if p:
+            return p
+        elif target.startswith("keep:"):
             return (target, target)
         elif self.keepdir and target.startswith(self.keepdir):
-            return (target, "keep:" + target[len(self.keepdir)+1:])
+            kp = "keep:" + target[len(self.keepdir)+1:]
+            return (kp, kp)
         else:
-            return super(ArvPathMapper, self).reversemap(target)
+            return None
 
 class StagingPathMapper(PathMapper):
     _follow_dirs = True

-----------------------------------------------------------------------


hooks/post-receive
--