From: Carl Hetherington <cth@carlh.net>
Date: Sun, 20 Feb 2022 01:02:33 +0000 (+0100)
Subject: Try to avoid some bad filenaming in rare cases.
X-Git-Tag: v2.16.3~3
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=80c1c900a1cdc30524b2de3dc0ef65c8acd2c248

Try to avoid some bad filenaming in rare cases.
---

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()