summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-31 19:44:04 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-31 19:44:04 +0000
commit96e4cf57b2306372490e167247f7b219c8566afa (patch)
tree856f39051e8d15b27300f981e2638b76212d61c7
parentf8c3ee586462ab1edb5bad68d93bce23f9f35de3 (diff)
downloadportage-96e4cf57b2306372490e167247f7b219c8566afa.tar.gz
portage-96e4cf57b2306372490e167247f7b219c8566afa.tar.bz2
portage-96e4cf57b2306372490e167247f7b219c8566afa.zip
Make dblink.delete() remove empty parent category directories. (trunk r14754)
svn path=/main/branches/2.1.7/; revision=14758
-rw-r--r--pym/portage/dbapi/vartree.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 4284eff9b..aae16e43f 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1230,6 +1230,11 @@ class dblink(object):
return
shutil.rmtree(self.dbdir)
+ # If empty, remove parent category directory.
+ try:
+ os.rmdir(os.path.dirname(self.dbdir))
+ except OSError:
+ pass
self.vartree.dbapi._remove(self)
def clearcontents(self):