diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-02 13:24:20 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-08 10:44:12 +0000 |
| commit | e5daa66dfdb5a5c3ccece615c09544755a321543 (patch) | |
| tree | 8ec971d29c7bdb5aac89b5e331070a98e5a3174c /packaging-tools/sdkcomponent.py | |
| parent | 365182e459bd7d9e9b7fb279db40652922b2c60b (diff) | |
Apply all subtitutions to the package names
Rename the package components and template files using
all substitutions, instead of just the predefined
QT_PKG_VERSION.
Change-Id: Iaedef6ac3bd7e4a316e445c6a05297d0ce4aa845
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'packaging-tools/sdkcomponent.py')
| -rw-r--r-- | packaging-tools/sdkcomponent.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/packaging-tools/sdkcomponent.py b/packaging-tools/sdkcomponent.py index 3bc539928..2d1fb61d9 100644 --- a/packaging-tools/sdkcomponent.py +++ b/packaging-tools/sdkcomponent.py @@ -126,10 +126,7 @@ class SdkComponent: # look up correct package template directory from list found = False for item in self.key_value_substitution_list: - if "%QT_PKG_VERSION%" in item: - self.package_name = self.package_name.replace(item[0], item[1]) - if "%QT_PKG_VERSION_MINOR%" in item: - self.package_name = self.package_name.replace(item[0], item[1]) + self.package_name = self.package_name.replace(item[0], item[1]) for item in self.packages_full_path_list: template_full_path = os.path.normpath(item + os.sep + self.package_subst_name) if os.path.exists(template_full_path): |