summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-02-20 02:02:33 +0100
committerCarl Hetherington <cth@carlh.net>2022-02-20 02:02:33 +0100
commit80c1c900a1cdc30524b2de3dc0ef65c8acd2c248 (patch)
tree8655db9c0c0e33d662c35719d47c6bbea3b5fc90
parentee254e6159964427e0536c7d9075483fdafd963f (diff)
Try to avoid some bad filenaming in rare cases.
-rw-r--r--wscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/wscript b/wscript
index 5c729bd43..239f45bf8 100644
--- a/wscript
+++ b/wscript
@@ -47,7 +47,7 @@ if not isinstance(this_version, str):
if not isinstance(last_version, str):
last_version = last_version.decode('utf-8')
-if this_version == '':
+if this_version == '' or this_version == 'merged-to-main':
VERSION = '%sdevel' % last_version[1:].strip()
else:
VERSION = this_version[1:].strip()