0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't rmdir directories that git rm has already taken care of

Browse source
This commit is contained in:
Alexander van Gessel 2012-09-14 18:24:49 +01:00
parent 735390e070
commit 599082cd5a
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/tools/wesnoth/libgithub.py
View file

@ -227,7 +227,9 @@ class Addon(object):
if os.path.isdir(relpath):
self._rmtree(relpath, exclude)
self._execute(["rmdir", "--ignore-fail-on-non-empty", relpath])
# git rm removes directories that it empties
if os.path.exists(relpath):
self._execute(["rmdir", "--ignore-fail-on-non-empty", relpath])
else:
self._execute(["git", "rm", relpath], check_error=True)