[ARVADOS] updated: e20dfe63dea30fc45bd4fa50aa9d6b5ab1040c99

Git user git at public.curoverse.com
Mon Mar 20 15:04:42 EDT 2017


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

       via  e20dfe63dea30fc45bd4fa50aa9d6b5ab1040c99 (commit)
      from  db7c2ba7523fbce1dc47ea1a715a738a28b3bb3b (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 e20dfe63dea30fc45bd4fa50aa9d6b5ab1040c99
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Mar 20 15:04:38 2017 -0400

    If API server doesn't publish supported Docker image versions, make that an
    error instead of a warning (can be overridden with --force-image-format)
    refs #8567

diff --git a/sdk/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py
index a0dc43e..5783248 100644
--- a/sdk/python/arvados/commands/keepdocker.py
+++ b/sdk/python/arvados/commands/keepdocker.py
@@ -111,8 +111,8 @@ def docker_image_format(image_hash):
 def docker_image_compatible(api, image_hash):
     supported = api._rootDesc.get('dockerImageFormats', [])
     if not supported:
-        logger.warn("server does not specify supported image formats (see docker_image_formats in server config). Continuing.")
-        return True
+        logger.warn("server does not specify supported image formats (see docker_image_formats in server config).")
+        return False
 
     fmt = docker_image_format(image_hash)
     if fmt in supported:

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list