From f380b960018e5b81b6a10834822fa962bfab2c7b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Sep 2018 21:30:36 +0100 Subject: Fix missing version string when Popen communicate returns byte strings. --- wscript | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wscript b/wscript index f8d9f113..1d35e9ac 100644 --- 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: -- cgit v1.2.3