From adea68a8a26767c46a6d5bee410c5a334f9226d1 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 2 Aug 2017 15:01:21 +0100 Subject: [PATCH] git_sha1_gen: fix output on python3 String handling has changed on python3. Before this patch, on python3: #define MESA_GIT_SHA1 "git-b'b99dcbfeb3'" After: #define MESA_GIT_SHA1 "git-b99dcbfeb3" (No change on python2, it always looked ok) Cc: Jose Fonseca Fixes: b99dcbfeb344390fea99 "build: Convert git_sha1_gen script to Python." Signed-off-by: Eric Engestrom Reviewed-by: Jose Fonseca --- bin/git_sha1_gen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/git_sha1_gen.py b/bin/git_sha1_gen.py index e26d3a3f764..97981fbba24 100755 --- a/bin/git_sha1_gen.py +++ b/bin/git_sha1_gen.py @@ -12,7 +12,7 @@ try: 'rev-parse', '--short=10', 'HEAD', - ], stderr=open(os.devnull, 'w')) + ], stderr=open(os.devnull, 'w')).decode("ascii") except: # don't print anything if it fails pass -- 2.30.2