Fix missing version string when Popen communicate returns byte strings.
authorCarl Hetherington <cth@carlh.net>
Mon, 10 Sep 2018 20:30:36 +0000 (21:30 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 10 Sep 2018 20:30:36 +0000 (21:30 +0100)
wscript

diff --git a/wscript b/wscript
index f8d9f113cb207249fda65513db95e47fda77cdae..1d35e9ac43936b0e821f1c728ad11f245a6e2d85 100644 (file)
--- a/wscript
+++ b/wscript
@@ -43,6 +43,11 @@ APPNAME = 'libdcp'
 this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
 last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
 
+if isinstance(this_version, bytes):
+    this_version = this_version.decode('UTF-8')
+if isinstance(last_version, bytes):
+    last_version = last_version.decode('UTF-8')
+
 if this_version == '':
     VERSION = '%sdevel' % last_version[1:].strip()
 else: