From 8ac89fe9edf303361b3828734837b87b5b7e78f4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Wed, 11 Jul 2018 09:29:13 +0100 Subject: [PATCH] utils/version: do not decode bytes Check that the resulting output inside get_commit() is a str before attempting to decode it when running on Python 3. --- devlib/utils/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devlib/utils/version.py b/devlib/utils/version.py index 2830630..15bf481 100644 --- a/devlib/utils/version.py +++ b/devlib/utils/version.py @@ -24,7 +24,7 @@ def get_commit(): p.wait() if p.returncode: return None - if sys.version_info[0] == 3: + if sys.version_info[0] == 3 and isinstance(std, str): return std[:8].decode(sys.stdout.encoding, 'replace') else: return std[:8]