openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Check third-party container image metadata." into stable/stein

This commit is contained in:
Zuul 2019-07-03 22:53:47 +00:00 committed by Gerrit Code Review
parent f48331f36b bc54316c2a
commit 55001e0438
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tripleo_common/image/image_uploader.py
View File

@ -566,7 +566,10 @@ class BaseImageUploader(object):
fallback_tag=None): fallback_tag=None):
labels = i.get('Labels', {}) labels = i.get('Labels', {})
label_keys = ', '.join(labels.keys()) if(hasattr(labels, 'keys')):
label_keys = ', '.join(labels.keys())
else:
label_keys = ""
if not tag_from_label: if not tag_from_label:
raise ImageUploaderException( raise ImageUploaderException(
@ -587,7 +590,9 @@ class BaseImageUploader(object):
(image, e, label_keys) (image, e, label_keys)
) )
else: else:
tag_label = labels.get(tag_from_label) tag_label = None
if(isinstance(labels, dict)):
tag_label = labels.get(tag_from_label)
if tag_label is None: if tag_label is None:
if fallback_tag: if fallback_tag:
tag_label = fallback_tag tag_label = fallback_tag