diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-01 19:09:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-01 19:09:35 -0400 |
| commit | 990da9e54e24ee9774bcf4b2912d4f7f853495a8 (patch) | |
| tree | 168068a281d3ca663504f3308049d0b9e34fed0e /mesonbuild/scripts/uninstall.py | |
| parent | 0ab9f2306185a6e534674167a4d40f32ea6ff670 (diff) | |
| parent | d436869a89eee7c6e43ddf799386b16a4acdf74c (diff) | |
| download | meson-990da9e54e24ee9774bcf4b2912d4f7f853495a8.zip meson-990da9e54e24ee9774bcf4b2912d4f7f853495a8.tar.gz meson-990da9e54e24ee9774bcf4b2912d4f7f853495a8.tar.bz2 | |
Merge pull request #2033 from whot/wip/remove-directories-on-uninstall
Remove created directories on ninja uninstall
Diffstat (limited to 'mesonbuild/scripts/uninstall.py')
| -rw-r--r-- | mesonbuild/scripts/uninstall.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/scripts/uninstall.py b/mesonbuild/scripts/uninstall.py index 1480921..bdc036b 100644 --- a/mesonbuild/scripts/uninstall.py +++ b/mesonbuild/scripts/uninstall.py @@ -24,7 +24,10 @@ def do_uninstall(log): continue fname = line.strip() try: - os.unlink(fname) + if os.path.isdir(fname) and not os.path.islink(fname): + os.rmdir(fname) + else: + os.unlink(fname) print('Deleted:', fname) successes += 1 except Exception as e: |