[ARVADOS] updated: 909313b20ed5055d62113f0eea123f362869c3f4

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/arvcontainer.py |  3 ++-
 sdk/cwl/arvados_cwl/pathmapper.py   | 11 ++++++-----
 sdk/cwl/tests/arvados-tests.sh      |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

       via  909313b20ed5055d62113f0eea123f362869c3f4 (commit)
       via  4f68551a87ff2cb88c23a2942abe2676a33f7cbb (commit)
       via  f49bc2790a18de14e22e69fb39f93805488fdbb3 (commit)
      from  86a6e4fe9347570090d1d1471f98675c3fb758f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 909313b20ed5055d62113f0eea123f362869c3f4
Merge: 86a6e4f 4f68551
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Apr 10 10:59:05 2017 -0400

    Merge branch '11332-cwl-url-quoting' refs #11332


commit 4f68551a87ff2cb88c23a2942abe2676a33f7cbb
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Apr 10 10:58:33 2017 -0400

    11332: Add @ to quote safelist.

diff --git a/sdk/cwl/arvados_cwl/pathmapper.py b/sdk/cwl/arvados_cwl/pathmapper.py
index 74401ca..a8619a8 100644
--- a/sdk/cwl/arvados_cwl/pathmapper.py
+++ b/sdk/cwl/arvados_cwl/pathmapper.py
@@ -106,7 +106,7 @@ class ArvPathMapper(PathMapper):
                                              project=self.arvrunner.project_uuid)
 
         for src, ab, st in uploadfiles:
-            self._pathmap[src] = MapperEnt(urllib.quote(st.fn, "/:+"), self.collection_pattern % st.fn[5:], "File")
+            self._pathmap[src] = MapperEnt(urllib.quote(st.fn, "/:+@"), self.collection_pattern % st.fn[5:], "File")
             self.arvrunner.add_uploaded(src, self._pathmap[src])
 
         for srcobj in referenced_files:

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


hooks/post-receive
--