From bbb1f692cdb2cdf5ddfb8b4d7012e7dee52787d8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 4 Feb 2022 11:47:29 +0100 Subject: 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 --- kolla/common/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.' -- cgit v1.2.3