[ARVADOS] updated: 1.3.0-2105-g6275b9ec9

Git user git at public.arvados.org
Thu Jan 23 22:11:23 UTC 2020


Summary of changes:
 sdk/cwl/arvados_cwl/fsaccess.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

       via  6275b9ec9584e82f33688674a19225361fefa36b (commit)
      from  8b7de058f2d71698513ddbedfd5870a196c579bf (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 6275b9ec9584e82f33688674a19225361fefa36b
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Jan 23 17:09:59 2020 -0500

    Fix setting workflow label field from record name fixes #16083
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/arvados_cwl/fsaccess.py b/sdk/cwl/arvados_cwl/fsaccess.py
index c1ea586b0..bc2c5e34d 100644
--- a/sdk/cwl/arvados_cwl/fsaccess.py
+++ b/sdk/cwl/arvados_cwl/fsaccess.py
@@ -229,8 +229,9 @@ class CollectionFetcher(DefaultFetcher):
                 return f.read()
         if url.startswith("arvwf:"):
             record = self.api_client.workflows().get(uuid=url[6:]).execute(num_retries=self.num_retries)
-            definition = record["definition"] + ('\nlabel: "%s"\n' % record["name"].replace('"', '\\"'))
-            return definition
+            definition = yaml.round_trip_load(record["definition"])
+            definition["label"] = record["name"]
+            return yaml.round_trip_dump(definition)
         return super(CollectionFetcher, self).fetch_text(url)
 
     def check_exists(self, url):

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list