openstack
/
tripleo-common
Code Issues Proposed changes

Merge "image_uploader (attempt #3): fix images upload with no labels" into stable/train

This commit is contained in:
Zuul 2020-02-06 22:09:16 +00:00 committed by Gerrit Code Review
parent 98a54fabf6 bcec69e0dc
commit 18d4fbc5aa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_common/image/image_uploader.py
View File

@ -772,7 +772,7 @@ class BaseImageUploader(object):
tag_label = tag_from_label.format(**labels) tag_label = tag_from_label.format(**labels)
except ValueError as e: except ValueError as e:
raise ImageUploaderException(e) raise ImageUploaderException(e)
except KeyError as e: except (KeyError, TypeError) as e:
if fallback_tag: if fallback_tag:
tag_label = fallback_tag tag_label = fallback_tag
else: else: