1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index 1302818a..a3561aee 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2992,7 +2992,8 @@ class MergeTask(object):
 							try:
 								os.rmdir(catdir)
 							except OSError, e:
-								if e.errno != errno.ENOTEMPTY:
+								if e.errno not in (errno.ENOENT,
+									errno.ENOTEMPTY, errno.EEXIST):
 									raise
 								del e
 							portage_locks.unlockdir(catdir_lock)