From 3d1a1c2519d0ea5fa2c14090be048e1cc931cb92 Mon Sep 17 00:00:00 2001 From: DrChat Date: Fri, 15 Dec 2017 23:43:27 -0600 Subject: [PATCH] Properly decode git information before printing it into version.h --- xenia-build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xenia-build b/xenia-build index fd5c1805a..b3847a5d5 100755 --- a/xenia-build +++ b/xenia-build @@ -215,14 +215,14 @@ def get_git_head_info(): 'HEAD', ], stdout=subprocess.PIPE, stderr=subprocess.PIPE) (stdout, stderr) = p.communicate() - branch_name = stdout.strip() or 'detached' + branch_name = stdout.decode('ascii').strip() or 'detached' p = subprocess.Popen([ 'git', 'rev-parse', 'HEAD', ], stdout=subprocess.PIPE, stderr=subprocess.PIPE) (stdout, stderr) = p.communicate() - commit = stdout.strip() or 'unknown' + commit = stdout.decode('ascii').strip() or 'unknown' p = subprocess.Popen([ 'git', 'rev-parse', @@ -230,7 +230,7 @@ def get_git_head_info(): 'HEAD', ], stdout=subprocess.PIPE, stderr=subprocess.PIPE) (stdout, stderr) = p.communicate() - commit_short = stdout.strip() or 'unknown' + commit_short = stdout.decode('ascii').strip() or 'unknown' return branch_name, commit, commit_short