From e38218a9ca8158d880d13f971ccd531704683025 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 26 Sep 2007 04:06:08 +0000 Subject: [PATCH] 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 --- bin/emerge | 10 ++++++++++ 1 file changed, 10 insertions(+) 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) -- 2.26.2