diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-16 16:04:59 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-09-19 05:28:47 +0000 |
| commit | 3f2b7d68ad929d4e3f3677da6047061d558e15f6 (patch) | |
| tree | a190fe8521581e2c7a4fec73ecb498869e7229ce | |
| parent | 3097c059b9ba913a3ec46a8c49f57058ace24954 (diff) | |
Don't skip repackaging when archive has target_install_dir
Repackaging was skipped even if archive had a target_install_dir set.
Change-Id: Ic2b3007e6d5dfbeae8a5b3d342c76956318cc2aa
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| -rw-r--r-- | packaging-tools/create_installer.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging-tools/create_installer.py b/packaging-tools/create_installer.py index 1c3ef686e..c5545c279 100644 --- a/packaging-tools/create_installer.py +++ b/packaging-tools/create_installer.py @@ -718,6 +718,7 @@ def get_component_data(sdk_component, archive, install_dir, data_dir_dest, compr and not archive.package_finalize_items \ and not archive.rpath_target \ and sdk_component.target_install_base == '/' \ + and not archive.target_install_dir \ and package_raw_name == archive.archive_name: print ' No repackaging actions required for the package, just download it directly to data directory' downloadedArchive = os.path.normpath(data_dir_dest + os.sep + package_raw_name) |