From ddfee3bb5861be8a6d29070e2ebce7d8f54841b8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 5 Dec 2022 00:28:54 +0100 Subject: Fix reading of git tags for .pc file versioning. --- wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wscript') 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() -- cgit v1.2.3