diff options
| author | Patrik Teivonen <patrik.teivonen@qt.io> | 2022-05-20 15:31:55 +0300 |
|---|---|---|
| committer | Patrik Teivonen <patrik.teivonen@qt.io> | 2022-11-01 12:57:16 +0000 |
| commit | ab2a0c63765849cc1614dccc611a10edde5ec96b (patch) | |
| tree | 0cdde8d2e1ca7c565a37185148edde650849bca8 /packaging-tools/bld_module.py | |
| parent | 3e87e74845ee2989e77472973f687efbb32b679a (diff) | |
Refactor runner.py functions
Rewrite runner.py
Follow up patch: run_command from bld_utils.py
Requires following patch in 6cc08ee72a7eb1860bb2f982879ff71c6dda2e10
Change-Id: I984046f56d4faac8ac58f12d0dad07d7bae4b0a2
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'packaging-tools/bld_module.py')
| -rwxr-xr-x | packaging-tools/bld_module.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packaging-tools/bld_module.py b/packaging-tools/bld_module.py index bda7a1180..11c462ced 100755 --- a/packaging-tools/bld_module.py +++ b/packaging-tools/bld_module.py @@ -60,7 +60,7 @@ from bldinstallercommon import ( ) from installer_utils import PackagingError from logging_util import init_logger -from runner import do_execute_sub_process +from runner import run_cmd from threadedwork import ThreadedWork log = init_logger(__name__, debug_mode=False) @@ -83,8 +83,7 @@ def patch_archive(base_dir: str, search_strings: List[str], qt_install_prefix: s ############################### def get_qt_install_prefix(qt_path: str) -> str: cmd_args = [os.path.join(qt_path, 'bin', 'qmake'), '-query', 'QT_INSTALL_PREFIX'] - _, qt_install_prefix = do_execute_sub_process(cmd_args, qt_path, get_output=True) - return qt_install_prefix.strip() + return run_cmd(cmd=cmd_args, cwd=qt_path).strip() ############################### |