From 2f8fc3254802f15f4231ed9cf5e522b57f07a16a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 13 Sep 2007 16:48:05 +0000 Subject: [PATCH] Bug #192321 - Clean dir.old cruft so that they don't prevent unmerge of otherwise empty directories. svn path=/main/trunk/; revision=7774 --- pym/emerge/__init__.py | 10 ++++++++++ 1 file changed, 10 insertions(+) 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) -- 2.26.2