Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r14754 - main/trunk/pym/portage/dbapi
Date: Sat, 31 Oct 2009 19:08:47
Message-Id: E1N4JJd-0008Eq-PI@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-10-31 19:08:45 +0000 (Sat, 31 Oct 2009)
3 New Revision: 14754
4
5 Modified:
6 main/trunk/pym/portage/dbapi/vartree.py
7 Log:
8 Make dblink.delete() remove empty parent category directories.
9
10
11 Modified: main/trunk/pym/portage/dbapi/vartree.py
12 ===================================================================
13 --- main/trunk/pym/portage/dbapi/vartree.py 2009-10-31 18:59:37 UTC (rev 14753)
14 +++ main/trunk/pym/portage/dbapi/vartree.py 2009-10-31 19:08:45 UTC (rev 14754)
15 @@ -1947,6 +1947,11 @@
16 return
17
18 shutil.rmtree(self.dbdir)
19 + # If empty, remove parent category directory.
20 + try:
21 + os.rmdir(os.path.dirname(self.dbdir))
22 + except OSError:
23 + pass
24 self.vartree.dbapi._remove(self)
25
26 def clearcontents(self):