diff options
| author | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2022-06-27 19:56:45 +0200 |
|---|---|---|
| committer | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2022-06-29 11:01:33 +0200 |
| commit | ea9ac28cc215289ae46b1679c58a3acfc66883fc (patch) | |
| tree | 0cb3289a4765d9918bff799947f13aa258e40387 /coin_test_instructions.py | |
| parent | 5316feb88d9700f3acef3f83ccc30927fdfdfef0 (diff) | |
build: rename our rmtree to avoid shutil conflict
There is an implementation in the 'utils' module that
implements a 'rmtree' function to handle removing readonly files
from a directory. To avoid confusion with shutil.rmtree we rename
it to 'remove_tree'.
Pick-to: 6.2 6.3
Change-Id: I3548ea81f36c87ba51fd984fcf7b1cd4cafd54d6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'coin_test_instructions.py')
| -rw-r--r-- | coin_test_instructions.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 8df41eb04..e90c9e8af 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -6,7 +6,7 @@ import sys from build_scripts.options import has_option, log, option_value from build_scripts.utils import (expand_clang_variables, get_ci_qmake_path, - get_qtci_virtualEnv, rmtree, run_instruction) + get_qtci_virtualEnv, remove_tree, run_instruction) log.set_verbosity(log.INFO) @@ -29,7 +29,7 @@ CI_RELEASE_CONF = has_option("packaging") def call_testrunner(python_ver, buildnro): _pExe, _env, env_pip, env_python = get_qtci_virtualEnv(python_ver, CI_HOST_OS, CI_HOST_ARCH, CI_TARGET_ARCH) - rmtree(_env, True) + remove_tree(_env, True) # Pinning the virtualenv before creating one # Use pip3 if possible while pip seems to install the virtualenv to wrong dir in some OS python3 = "python3" |