Bug #192321 - Clean dir.old cruft so that they don't prevent unmerge of

otherwise empty directories.

svn path=/main/trunk/; revision=7774

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index d27eb86868b88bd241d2c72cff274cb2c9a82ba1..b09e20537f159024af0c3d0b044cd5477b88b2d8 100644 (file)
--- 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)