From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 12 Sep 2007 15:27:40 +0000 (-0000)
Subject: Catch errno.ENOTDIR instead of using os.path.isdir().
X-Git-Tag: v2.2_pre1~808
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=16a1cc858b8552a524f29b61e32a47161bcc2d6c;p=portage.git

Catch errno.ENOTDIR instead of using os.path.isdir().

svn path=/main/trunk/; revision=7770
---

diff --git a/pym/portage/eclass_cache.py b/pym/portage/eclass_cache.py
index 6e4eebd18..8fac8aec4 100644
--- a/pym/portage/eclass_cache.py
+++ b/pym/portage/eclass_cache.py
@@ -43,8 +43,6 @@ class cache(object):
 		self._eclass_locations = {}
 		eclass_len = len(".eclass")
 		for x in [normalize_path(os.path.join(y,"eclass")) for y in self.porttrees]:
-			if not os.path.isdir(x):
-				continue
 			eclass_filenames = []
 			try:
 				for y in os.listdir(x):
@@ -54,6 +52,9 @@ class cache(object):
 				if e.errno == errno.ENOENT:
 					del e
 					continue
+				elif e.errno == errno.ENOTDIR:
+					del e
+					continue
 				elif e.errno == PermissionDenied.errno:
 					raise PermissionDenied(x)
 				raise