Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up up and away...

Browse Source
This commit is contained in:
Faik Uygur
2006-04-11 18:00:52 +00:00
parent dc6e267bd1
commit 64f310717d
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/atomicoperations.py
+9 -6
View File
@@ -411,14 +411,17 @@ class Remove(AtomicOperation):
else: else:
if os.path.isfile(fpath) or os.path.islink(fpath): if os.path.isfile(fpath) or os.path.islink(fpath):
os.unlink(fpath) os.unlink(fpath)
dpath = os.path.dirname(fpath) elif os.path.isdir(fpath) and not os.listdir(fpath):
while dpath != '/' and not os.listdir(dpath): os.rmdir(fpath)
os.rmdir(dpath)
dpath = os.path.dirname(dpath)
elif os.path.isdir(fpath) and not os.listdir(fpath):
os.rmdir(fpath)
else: else:
ctx.ui.warning(_('Not removing non-file, non-link %s') % fpath, True) ctx.ui.warning(_('Not removing non-file, non-link %s') % fpath, True)
return
# remove emptied directories
dpath = os.path.dirname(fpath)
while dpath != '/' and not os.listdir(dpath):
os.rmdir(dpath)
dpath = os.path.dirname(dpath)
remove_file = staticmethod(remove_file) remove_file = staticmethod(remove_file)