From 3ffacfb6ae46ed2e5eddac3192921d37aabe957d Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Wed, 29 May 2019 08:36:14 +0300 Subject: bldinstallercommon.py: use shutil.rmtree instead of native call Invoking native shell command via subprocess is slow and there exists shutil.rmtree which should be preferred anyways. Change-Id: Iaf47334e0617dedbb11dfc63f2b3cd92cc5393fb Reviewed-by: Antti Kokko --- packaging-tools/bldinstallercommon.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/packaging-tools/bldinstallercommon.py b/packaging-tools/bldinstallercommon.py index ddad07a89..a3518dfd8 100644 --- a/packaging-tools/bldinstallercommon.py +++ b/packaging-tools/bldinstallercommon.py @@ -365,16 +365,7 @@ def remove_tree(path): if os.path.isdir(path) and os.path.exists(path): if IS_WIN_PLATFORM: path = win32api.GetShortPathName(path.replace('/', '\\')) - #a funny thing is that rmdir does not set an exitcode it is just using the last set one - try: - runCommand(['rmdir', path, '/S', '/Q'], SCRIPT_ROOT_DIR, onlyErrorCaseOutput=True) - except: - traceback.print_exc() - pass - else: - #shutil.rmtree(path) - runCommand(['rm', '-rf', path], SCRIPT_ROOT_DIR, onlyErrorCaseOutput=True) - return not os.path.exists(path) + shutil.rmtree(path) ############################### -- cgit v1.2.3