diff options
| author | Patrik Teivonen <patrik.teivonen@qt.io> | 2022-09-23 09:26:56 +0300 |
|---|---|---|
| committer | Patrik Teivonen <patrik.teivonen@qt.io> | 2022-09-23 08:15:03 +0000 |
| commit | 3e01d055325322cbb4fe20b1917baeb0e84a4cf3 (patch) | |
| tree | a6b30572afacb363f292cf923fa172fb9446ca09 | |
| parent | 5cc5a8d307708f7ed3051d2bcd78e1e51cefa9f6 (diff) | |
Fix UnboundLocalError in Qtcreator buildv6.4.0-packaging
A small regression in the previous patch left qtc_additional_config variable unbound causing the job to fail.
Add some missing type hints left out before and remove a line addition to make hooks pass.
Change-Id: I84318e3e6a4e3f052e8ac31e16286ebe43f17bf9
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | packaging-tools/bld_sdktool.py | 5 | ||||
| -rw-r--r-- | packaging-tools/build_wrapper.py | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/packaging-tools/bld_sdktool.py b/packaging-tools/bld_sdktool.py index 6ba024058..98241235d 100644 --- a/packaging-tools/bld_sdktool.py +++ b/packaging-tools/bld_sdktool.py @@ -31,7 +31,6 @@ import argparse import os - from collections import namedtuple from io import TextIOWrapper from pathlib import Path @@ -153,7 +152,7 @@ def zip_sdktool(sdktool_target_path: str, out_7zip: str, redirect_output: Option ) -def get_arguments(): +def get_arguments() -> argparse.Namespace: parser = argparse.ArgumentParser(description='Build sdktool') parser.add_argument('--qt-url', help='URL to Qt sources', required=True) parser.add_argument('--qt-build', help='Path that is used for building Qt', @@ -168,7 +167,7 @@ def get_arguments(): return parser.parse_args() -def main(): +def main() -> None: args = get_arguments() build_sdktool(args.qt_url, args.qt_build, args.src, args.build, args.install, args.make_command) diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index f3f6eb1dd..d66e829d3 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -655,8 +655,7 @@ def handle_qt_creator_build(option_dict: Dict[str, str], qtcreator_plugins: List usp_auth_key = option_dict.get('USP_AUTH_KEY') qtc_additional_cfg: str = option_dict.get('QTC_ADDITIONAL_CONFIG', '') # optional disable_docs = option_dict.get('DISABLE_DOCS') # optional - if qtc_additional_cfg: - qtc_additional_config: List[str] = qtc_additional_cfg.split() + qtc_additional_config: List[str] = qtc_additional_cfg.split() qt_temp = os.path.join(work_dir, 'qt_temp') def module_filename(module: str) -> str: |