diff options
| author | Antti Kokko <antti.kokko@qt.io> | 2020-01-30 10:03:01 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@qt.io> | 2020-01-30 08:05:21 +0000 |
| commit | aa800b7f3c864012ea82100f45f9231cb616cfe3 (patch) | |
| tree | 25c02806e4cd446ba047350f9e7c02f9202caa50 | |
| parent | 16ca767c6e3a39420426d2199111bf5f6ac2b585 (diff) | |
Fix path concatenation in sdkcomponent.pyv5.12.7-packaging
Because configuration files use Unix paths we can't use os.path.join
on Windows.
Change-Id: Icfca76d540498fbd2c13a735934695dc4bffefb3
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| -rw-r--r-- | packaging-tools/sdkcomponent.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging-tools/sdkcomponent.py b/packaging-tools/sdkcomponent.py index adf8f9438..a4abe9c6a 100644 --- a/packaging-tools/sdkcomponent.py +++ b/packaging-tools/sdkcomponent.py @@ -86,9 +86,9 @@ class SdkComponent: def get_archive_installation_directory(self): if self.target_install_base: - return os.path.join(self.target_install_base, self.target_install_dir) + return self.target_install_base + os.path.sep + self.target_install_dir else: - return os.path.join(self.parent_target_install_base, self.target_install_dir) + return self.parent_target_install_base + os.path.sep + self.target_install_dir def __init__(self, section_name, target_config, packages_full_path_list, archive_location_resolver, key_value_substitution_list, is_offline_build): |