projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '12195-nodemanager-quota-error'
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
pathmapper.py
diff --git
a/sdk/cwl/arvados_cwl/pathmapper.py
b/sdk/cwl/arvados_cwl/pathmapper.py
index 5a2d814f5d0f614caefea7b1a08c9c36f6fc8925..c8ae77a8b69013718c51b6b579774b9d95d985ef 100644
(file)
--- 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):
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, 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:
else:
- return
super(ArvPathMapper, self).reversemap(target)
+ return
None
class StagingPathMapper(PathMapper):
_follow_dirs = True
class StagingPathMapper(PathMapper):
_follow_dirs = True