Merge "utils: be Python 2 compatible when squashing is enabled"
This commit is contained in:
commit
f16e410542
|
@ -69,5 +69,5 @@ def squash(old_image, new_image,
|
||||||
subprocess.check_output(cmds, stderr=subprocess.STDOUT) # nosec
|
subprocess.check_output(cmds, stderr=subprocess.STDOUT) # nosec
|
||||||
except subprocess.CalledProcessError as ex:
|
except subprocess.CalledProcessError as ex:
|
||||||
LOG.exception('Get error during squashing image: %s',
|
LOG.exception('Get error during squashing image: %s',
|
||||||
ex.stdout)
|
ex.output)
|
||||||
raise
|
raise
|
||||||
|
|
Loading…
Reference in New Issue