From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 4 Sep 2012 03:07:29 +0000 (-0700)
Subject: EbuildBuildDir: ignore rmdir failure, bug #400641
X-Git-Tag: v2.2.0_alpha125~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ed68a1bdb22fec478ac39b377961508cd3a30617;p=portage.git

EbuildBuildDir: ignore rmdir failure, bug #400641
---

diff --git a/pym/_emerge/EbuildBuildDir.py b/pym/_emerge/EbuildBuildDir.py
index 9773bd790..5d6a26232 100644
--- a/pym/_emerge/EbuildBuildDir.py
+++ b/pym/_emerge/EbuildBuildDir.py
@@ -7,7 +7,6 @@ import portage
 from portage import os
 from portage.exception import PortageException
 from portage.util.SlotObject import SlotObject
-import errno
 
 class EbuildBuildDir(SlotObject):
 
@@ -98,10 +97,8 @@ class EbuildBuildDir(SlotObject):
 		if catdir_lock.wait() == os.EX_OK:
 			try:
 				os.rmdir(self._catdir)
-			except OSError as e:
-				if e.errno not in (errno.ENOENT,
-					errno.ENOTEMPTY, errno.EEXIST, errno.EPERM):
-					raise
+			except OSError:
+				pass
 			finally:
 				catdir_lock.unlock()