diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-04-05 10:55:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-04-09 11:58:29 +0000 |
| commit | b9015cddce68d2858b70352d808e307944119f76 (patch) | |
| tree | efef983c0e7cb91e5e3905a6709c443cc7feddb5 | |
| parent | ff6d9a176c338f487e1361054e0135b055830fbe (diff) | |
Offline snapshots: Fix short version number for upload
It was cutting '4.10.0-beta1' to '4.1', instead of '4.10'
Change-Id: Ided272703aedda3f109bfc080a9176f5d904aab6
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| -rw-r--r-- | packaging-tools/build_wrapper.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index a97fe9f6d..b041bd787 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -1140,7 +1140,8 @@ def handle_installer_build(optionDict, project_name, installer_type): ext_server_base_url = optionDict['EXT_SERVER_BASE_URL'] ext_server_base_path = optionDict['EXT_SERVER_BASE_PATH'] # opensource distribution server directories #TODO, below - ext_dest_dir = ext_server_base_path + '/snapshots/' + project_name + '/' + optionDict['VERSION'][:3] + '/' + optionDict['VERSION_FULL'] + '/' + optionDict['BUILD_NUMBER'] + short_version = '.'.join(optionDict['VERSION'].split('.')[:2]) # 4.10.x -> 4.10 + ext_dest_dir = ext_server_base_path + '/snapshots/' + project_name + '/' + short_version + '/' + optionDict['VERSION_FULL'] + '/' + optionDict['BUILD_NUMBER'] cmd_args_mkdir_pkg = [optionDict['SSH_COMMAND'], optionDict['PACKAGE_STORAGE_SERVER_ADDR']] cmd_args_mkdir_ext = cmd_args_mkdir_pkg + ['ssh', ext_server_base_url, 'mkdir -p', ext_dest_dir] bldinstallercommon.do_execute_sub_process(cmd_args_mkdir_ext, SCRIPT_ROOT_DIR) |