diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-02-04 11:47:29 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-02-04 11:48:36 +0100 |
| commit | bbb1f692cdb2cdf5ddfb8b4d7012e7dee52787d8 (patch) | |
| tree | 45651ff1b83524cf46c7979cbe5f183326533994 | |
| parent | 405fca90f2c8d3763ac56ce8b925611d136bba6c (diff) | |
| download | kolla-bbb1f692cdb2cdf5ddfb8b4d7012e7dee52787d8.tar.gz kolla-bbb1f692cdb2cdf5ddfb8b4d7012e7dee52787d8.zip | |
stringify docker-squash version
Before:
(kolla) 11:46 (s) marcin@puchatek:kolla$ ./tools/build.py --squash
INFO:kolla.common.utils:Image squash is enabled and "docker-squash" version is b'1.0.8'
After:
(kolla) 11:46 (s) marcin@puchatek:kolla$ ./tools/build.py --squash
INFO:kolla.common.utils:Image squash is enabled and "docker-squash" version is 1.0.8
Change-Id: If1844434ff0b7c3b35d0a8e742c7e2fad0dc8758
| -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.' |