diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-11-04 22:04:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-11-04 22:04:44 +0100 |
| commit | 79313d6246007e3dc38d0638aff979421f3f7917 (patch) | |
| tree | ad4370dfa492a60aecb63e95645388757f4a69bf | |
| parent | 7b0372776ac4da6a8e4ff29f41a4f08b9b4de506 (diff) | |
Hack for python 3 compatibility (Fedora 31).
| -rw-r--r-- | wscript | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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] +# 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: |
