[ARVADOS] updated: 03589784d8bc566305e1ea3473a8b37941147517

Git user git at public.curoverse.com
Mon Mar 20 10:02:20 EDT 2017


Summary of changes:
 sdk/python/arvados/commands/keepdocker.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

       via  03589784d8bc566305e1ea3473a8b37941147517 (commit)
      from  fd42d69ffa558918ec40f9aeaceb2cbf93de1e8a (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 03589784d8bc566305e1ea3473a8b37941147517
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Mar 20 10:02:16 2017 -0400

    8567: arv-keepdocker catches EPIPE so it doesn't print backtrace when piped to
    other commands such as "head".

diff --git a/sdk/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py
index 660b45d..5f29bf0 100644
--- a/sdk/python/arvados/commands/keepdocker.py
+++ b/sdk/python/arvados/commands/keepdocker.py
@@ -345,8 +345,14 @@ def main(arguments=None, stdout=sys.stdout):
     if args.image is None or args.image == 'images':
         fmt = "{:30}  {:10}  {:12}  {:29}  {:20}\n"
         stdout.write(fmt.format("REPOSITORY", "TAG", "IMAGE ID", "COLLECTION", "CREATED"))
-        for i, j in list_images_in_arv(api, args.retries):
-            stdout.write(fmt.format(j["repo"], j["tag"], j["dockerhash"][0:12], i, j["timestamp"].strftime("%c")))
+        try:
+            for i, j in list_images_in_arv(api, args.retries):
+                stdout.write(fmt.format(j["repo"], j["tag"], j["dockerhash"][0:12], i, j["timestamp"].strftime("%c")))
+        except IOError as e:
+            if e.errno == errno.EPIPE:
+                pass
+            else:
+                raise
         sys.exit(0)
 
     # Pull the image if requested, unless the image is specified as a hash

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list