From ff6aefe931380e74b6d6df1fd7d7297ab1e6552a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 2 Jan 2007 04:54:56 +0000 Subject: Don't bother to list the contents of directories before they are unmerged since it triggers unnecessary stat calls. Thanks to James Cloos for reporting. svn path=/main/trunk/; revision=5443 --- pym/portage.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 0fba8dfd4..685ba9568 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6853,22 +6853,13 @@ class dblink: mydirs.sort() mydirs.reverse() - last_non_empty = "" for obj in mydirs: - if not last_non_empty.startswith(obj) and not listdir(obj): - try: - os.rmdir(obj) - writemsg_stdout("<<< %s %s\n" % ("dir",obj)) - last_non_empty = "" - continue - except (OSError,IOError),e: - #immutable? - pass - - writemsg_stdout("--- !empty dir %s\n" % obj) - last_non_empty = obj - continue + try: + os.rmdir(obj) + writemsg_stdout("<<< %s %s\n" % ("dir",obj)) + except (OSError, IOError): + writemsg_stdout("--- !empty dir %s\n" % obj) #remove self from vartree database so that our own virtual gets zapped if we're the last node self.vartree.zap(self.mycpv) -- cgit v1.2.3-1-g7c22