summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@imgtec.com>2017-08-02 15:01:21 +0100
committerEric Engestrom <eric.engestrom@imgtec.com>2017-09-25 14:58:26 +0100
commitadea68a8a26767c46a6d5bee410c5a334f9226d1 (patch)
tree1574540ec8da7a020ed8db06a459e038a4f28c15
parentf3ed1d2f6b0fac9af64279eed96afa45e511650b (diff)
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 <jfonseca@vmware.com> Fixes: b99dcbfeb344390fea99 "build: Convert git_sha1_gen script to Python." Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
-rwxr-xr-xbin/git_sha1_gen.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/git_sha1_gen.py b/bin/git_sha1_gen.py
index e26d3a3f76..97981fbba2 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