[ARVADOS] updated: 1.3.0-2048-g2d5ddf2aa

[Git user]

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

       via  2d5ddf2aab06b47eebb3fafe91b506800ec8c0f5 (commit)
       via  6d1cb031f135b9b2bfd9262b08b7ab7650e8d92b (commit)
      from  5bc5b8c150860a22d7a66b14aedddf30e270c7b6 (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 2d5ddf2aab06b47eebb3fafe91b506800ec8c0f5
Merge: 5bc5b8c15 6d1cb031f
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Jan 2 15:54:45 2020 -0500

    Merge branch '15965-docker-metadata-decode' refs #15965
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>


commit 6d1cb031f135b9b2bfd9262b08b7ab7650e8d92b
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Jan 2 15:53:56 2020 -0500

    15965: Decode as UTF-8 to avoid "not ASCII" error on Python 2
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py
index d4fecc47b..62b9a9ed1 100644
--- a/sdk/python/arvados/commands/keepdocker.py
+++ b/sdk/python/arvados/commands/keepdocker.py
@@ -105,7 +105,7 @@ def docker_image_format(image_hash):
     cmd = popen_docker(['inspect', '--format={{.Id}}', image_hash],
                         stdout=subprocess.PIPE)
     try:
-        image_id = next(cmd.stdout).decode().strip()
+        image_id = next(cmd.stdout).decode('utf-8').strip()
         if image_id.startswith('sha256:'):
             return 'v2'
         elif ':' not in image_id:
@@ -136,7 +136,7 @@ def docker_images():
     next(list_output)  # Ignore the header line
     for line in list_output:
         words = line.split()
-        words = [word.decode() for word in words]
+        words = [word.decode('utf-8') for word in words]
         size_index = len(words) - 2
         repo, tag, imageid = words[:3]
         ctime = ' '.join(words[3:size_index])
@@ -513,7 +513,7 @@ def main(arguments=None, stdout=sys.stdout, install_sig_handlers=True, api=None)
         else:
             json_filename = raw_image_hash + '/json'
         json_file = image_tar.extractfile(image_tar.getmember(json_filename))
-        image_metadata = json.loads(json_file.read().decode())
+        image_metadata = json.loads(json_file.read().decode('utf-8'))
         json_file.close()
         image_tar.close()
         link_base = {'head_uuid': coll_uuid, 'properties': {}}

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


hooks/post-receive
--