From 32342f939e69355f62dccfa125a1017ffbe83b7a Mon Sep 17 00:00:00 2001 From: Michael Wild Date: Wed, 18 Jan 2012 22:10:05 +0100 Subject: [PATCH] FIX: text encoding issues with python 3 Signed-off-by: Michael Wild --- data/utilities/checkVersionInfo.py.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/utilities/checkVersionInfo.py.in b/data/utilities/checkVersionInfo.py.in index 72e388bb5..b1371d535 100755 --- a/data/utilities/checkVersionInfo.py.in +++ b/data/utilities/checkVersionInfo.py.in @@ -79,7 +79,7 @@ os.chdir(SOURCE_DIR) # get version info, output is of the form vX.Y.Z v = subprocess.check_output( - [GIT_EXECUTABLE, 'describe', '--abbrev=0'])[1:].strip() + [GIT_EXECUTABLE, 'describe', '--abbrev=0'])[1:].decode().strip() major, minor, patch = v.split('.') rc = '' idx = patch.find('rc', 1) @@ -90,9 +90,9 @@ if idx > 0: # get upstream info h = subprocess.check_output( [GIT_EXECUTABLE, 'merge-base', 'HEAD', - 'origin/upstream/OpenFOAM-'+UPSTREAM_VERSION]).strip() + 'origin/upstream/OpenFOAM-'+UPSTREAM_VERSION]).decode().strip() u = UPSTREAM_VERSION+'-'+subprocess.check_output( - [GIT_EXECUTABLE, 'log', '-1', '--pretty=format:%h', h]).strip() + [GIT_EXECUTABLE, 'log', '-1', '--pretty=format:%h', h]).decode().strip() # checks to perform retcode = 0 -- 2.11.4.GIT