summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-12-05 00:28:54 +0100
committerCarl Hetherington <cth@carlh.net>2022-12-05 00:28:54 +0100
commitddfee3bb5861be8a6d29070e2ebce7d8f54841b8 (patch)
tree45e0055afc6548eb9633ed6f921db8cb9120dd86
parent2c6d80c295dd3d10c1c9c08dd31758dd1abdf5da (diff)
Fix reading of git tags for .pc file versioning.
-rw-r--r--wscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/wscript b/wscript
index 9113ee27..ac3dbabd 100644
--- a/wscript
+++ b/wscript
@@ -40,8 +40,8 @@ from waflib import Logs, Context
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]
+this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0].decode('UTF-8')
+last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0].decode('UTF-8')
if this_version == '':
VERSION = '%sdevel' % last_version[1:].strip()