summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/emerge/__init__.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index d27eb8686..b09e20537 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -4366,6 +4366,16 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
raise
del e
+ # Clean dir.old cruft so that they don't prevent
+ # unmerge of otherwise empty directories.
+ for ext in dir_extensions:
+ try:
+ os.unlink(dir_file + ext + ".old")
+ except EnvironmentError, e:
+ if e.errno != errno.ENOENT:
+ raise
+ del e
+
#update mtime so we can potentially avoid regenerating.
prev_mtimes[inforoot] = long(os.stat(inforoot).st_mtime)