projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b03727
)
Hack for python 3 compatibility (Fedora 31).
author
Carl Hetherington
<cth@carlh.net>
Mon, 4 Nov 2019 21:04:44 +0000
(22:04 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 4 Nov 2019 21:04:44 +0000
(22:04 +0100)
wscript
patch
|
blob
|
history
diff --git
a/wscript
b/wscript
index 9cceb25ccc2216643b8fe01b63463dbe13272583..fefe14c602a4b8e39a62692162be8d7e191babe3 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-39,6
+39,12
@@
APPNAME = 'dcpomatic'
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]
last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
+# Python 2/3 compatibility; I don't really understand what's going on here
+if not isinstance(this_version, str):
+ this_version = this_version.decode('utf-8')
+if not isinstance(last_version, str):
+ last_version = last_version.decode('utf-8')
+
if this_version == '':
VERSION = '%sdevel' % last_version[1:].strip()
else:
if this_version == '':
VERSION = '%sdevel' % last_version[1:].strip()
else: