diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-16 00:19:04 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-02-17 18:36:14 +0200 |
| commit | b7c70c47a6473ee81b744b37da5a9f16b69d57a1 (patch) | |
| tree | a925400d0ee3fa92a4ba909dec0b9393ff62d89e /mesonbuild/mdist.py | |
| parent | 8650c763d99de2d2234f0bd7493b480474f7336b (diff) | |
| download | meson-b7c70c47a6473ee81b744b37da5a9f16b69d57a1.zip meson-b7c70c47a6473ee81b744b37da5a9f16b69d57a1.tar.gz meson-b7c70c47a6473ee81b744b37da5a9f16b69d57a1.tar.bz2 | |
mdist: Use windows_proof_rmtree when deleting
Diffstat (limited to 'mesonbuild/mdist.py')
| -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 37ac0b5..bfff50a 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 |