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

of otherwise empty directories. (trunk r7774)

svn path=/main/branches/2.1.2/; revision=7814

1 files changed, 10 insertions, 0 deletions

diff --git a/bin/emerge b/bin/emerge
index d7c884743..f3d6d95f1 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4413,6 +4413,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)