aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/build_wrapper.py
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@qt.io>2018-04-19 13:05:29 +0300
committerIikka Eklund <iikka.eklund@qt.io>2018-08-10 05:05:54 +0000
commita67f8ece361abdb513c8f2c374ff3fc5a0c3bc8a (patch)
treeb5ac1214f7713ec178380d03520eba8e94726db0 /packaging-tools/build_wrapper.py
parentce8ff0a1c554234b61b92efab652a78c2653748e (diff)
When removing previous latest successful installer ignore version tag
Now it leaves behind the various beta etc. versions of the latest successful installers. Do not use full version, which includes the version tag, when figuring out the name of the previous installer snapshot what to delete. Change-Id: I1f5fcb3deee1ef8fef8f31530f4afa27f42d7176 Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'packaging-tools/build_wrapper.py')
-rw-r--r--packaging-tools/build_wrapper.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py
index a00a9ee03..c950013a5 100644
--- a/packaging-tools/build_wrapper.py
+++ b/packaging-tools/build_wrapper.py
@@ -1106,7 +1106,7 @@ def replace_latest_successful_installer(optionDict, installer_name, installer_na
if "embedded" in installer_name_final.lower():
regex = re.compile(r'.*online(?:(?!_\d{4}).)*')
else:
- regex = re.compile('.*' + optionDict['VERSION_FULL'])
+ regex = re.compile('.*' + optionDict['VERSION'])
installer_base_name = "".join(regex.findall(installer_name_final))
if not installer_base_name:
print('*** Empty installer base name string')