summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-21 21:41:53 +0100
committerwm4 <wm4@nowhere>2014-01-21 21:41:53 +0100
commita48a1db1d0d9e06463dccc4de22ed0aa3ca453ef (patch)
treefb992d5c5bda2c75a28f1de30d15746fccfc4955
parent0a4fc15d26e8a8b8e75de417fd745088a8eb72a1 (diff)
downloadmpv-a48a1db1d0d9e06463dccc4de22ed0aa3ca453ef.tar.bz2
mpv-a48a1db1d0d9e06463dccc4de22ed0aa3ca453ef.tar.xz
waf: try to fix unicode/byte string messup
Some mpv builds identify with e.g. "mpv b'0.3.3' ". The version looks like str() was called on a Python byte string. I couldn't reproduce it on my machine (I tried with both Python 2 and 3), so I'm not exactly sure what's going on here, but I'm hoping this commit does fix it.
-rw-r--r--waftools/generators/headers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py
index 13f124a2dd..828d61fd57 100644
--- a/waftools/generators/headers.py
+++ b/waftools/generators/headers.py
@@ -6,7 +6,7 @@ def __get_version__(ctx):
cwd=ctx.srcnode.abspath())
process.wait()
(version, err) = process.communicate()
- return version.strip()
+ return version.strip().decode("utf-8")
def __get_build_date__():
import time