diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-16 00:19:04 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-16 00:19:34 +0530 |
| commit | 4b0dae15a8ba679c447d94ff6195e837fa78c1a3 (patch) | |
| tree | 21b569d3561b2138b270686942208858beebecc8 | |
| parent | c90cdb1de238f6860688881256694a6a307ebcec (diff) | |
| download | meson-nirbheek/dont-remote-distdir-on-failure.tar.gz | |
mdist: Use windows_proof_rmtree when deletingnirbheek/dont-remote-distdir-on-failure
| -rw-r--r-- | mesonbuild/mdist.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/mdist.py b/mesonbuild/mdist.py index 37ac0b5be..bfff50a64 100644 --- a/mesonbuild/mdist.py +++ b/mesonbuild/mdist.py @@ -201,7 +201,7 @@ def check_dist(packagename, meson_command, extra_meson_args, bld_root, privdir): installdir = os.path.join(privdir, 'dist-install') for p in (unpackdir, builddir, installdir): if os.path.exists(p): - shutil.rmtree(p) + windows_proof_rmtree(p) os.mkdir(p) ninja_bin = detect_ninja() shutil.unpack_archive(packagename, unpackdir) @@ -217,9 +217,9 @@ def check_dist(packagename, meson_command, extra_meson_args, bld_root, privdir): if ret > 0: print('Dist check build directory was {}'.format(builddir)) else: - shutil.rmtree(unpackdir) - shutil.rmtree(builddir) - shutil.rmtree(installdir) + windows_proof_rmtree(unpackdir) + windows_proof_rmtree(builddir) + windows_proof_rmtree(installdir) print('Distribution package %s tested' % packagename) return ret |