diff options
| author | Zuul <zuul@review.openstack.org> | 2018-11-11 02:44:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-11-11 02:44:19 +0000 |
| commit | f16e410542db39472a7672b4cb9b09883db94930 (patch) | |
| tree | d368bec277e09b122d083ed3cddf34e99fe64927 /kolla | |
| parent | 0cdfa0c8ca7126031dd9bfc05328ef63fb943c04 (diff) | |
| parent | 74b70d944f6bb26f46f4961077ca94a496eae9d3 (diff) | |
| download | kolla-f16e410542db39472a7672b4cb9b09883db94930.tar.gz kolla-f16e410542db39472a7672b4cb9b09883db94930.zip | |
Merge "utils: be Python 2 compatible when squashing is enabled"
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kolla/common/utils.py b/kolla/common/utils.py index bb499dfe5..8913b132e 100644 --- a/kolla/common/utils.py +++ b/kolla/common/utils.py @@ -69,5 +69,5 @@ def squash(old_image, new_image, subprocess.check_output(cmds, stderr=subprocess.STDOUT) # nosec except subprocess.CalledProcessError as ex: LOG.exception('Get error during squashing image: %s', - ex.stdout) + ex.output) raise |