From 0dc60ce69567f79f5d05148d80109cd7a6e93785 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 29 Jan 2007 01:46:37 +0000
Subject: Ignore EEXIST from rmdir since some kernels (such as solaris) return
 that instead of ENOTEMPTY. (trunk r5798)

svn path=/main/branches/2.1.2/; revision=5830
---
 bin/emerge | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/emerge b/bin/emerge
index 1302818a7..a3561aee7 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)
-- 
cgit v1.2.3-1-g7c22