diff options
| author | Zuul <zuul@review.opendev.org> | 2022-02-08 11:00:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-02-08 11:00:33 +0000 |
| commit | dd9ebe1f5c8abd62a33b54d66867240e0bcbcefd (patch) | |
| tree | 79f6b2d42a254b748736481c0ca11dbcb5988c99 /kolla | |
| parent | 5573e6e4f58c7f5ffd54e481a4af0e89ff88a03c (diff) | |
| parent | bbb1f692cdb2cdf5ddfb8b4d7012e7dee52787d8 (diff) | |
| download | kolla-dd9ebe1f5c8abd62a33b54d66867240e0bcbcefd.tar.gz kolla-dd9ebe1f5c8abd62a33b54d66867240e0bcbcefd.zip | |
Merge "stringify docker-squash version"
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 9cd8ecca9..68996e4b1 100644 --- a/kolla/common/utils.py +++ b/kolla/common/utils.py @@ -47,7 +47,7 @@ def get_docker_squash_version(): try: stdout = subprocess.check_output( # nosec ['docker-squash', '--version'], stderr=subprocess.STDOUT) - return stdout.split()[0] + return str(stdout.split()[0], 'utf-8') except OSError as ex: if ex.errno == 2: LOG.error(('"docker-squash" command is not found.' |