Simplify update_eclasses() a little.

svn path=/main/trunk/; revision=7861

diff --git a/pym/portage/eclass_cache.py b/pym/portage/eclass_cache.py
index 8fac8aec4826813fc1e4070b7888329b39563f65..806505757fecce36be01d3142ff3a0c89ef81bf0 100644 (file)
--- a/pym/portage/eclass_cache.py
+++ b/pym/portage/eclass_cache.py
@@ -42,23 +42,20 @@ class cache(object):
                self.eclasses = {}
                self._eclass_locations = {}
                eclass_len = len(".eclass")
+               ignored_listdir_errnos = (errno.ENOENT, errno.ENOTDIR)
                for x in [normalize_path(os.path.join(y,"eclass")) for y in self.porttrees]:
-                       eclass_filenames = []
                        try:
-                               for y in os.listdir(x):
-                                       if y.endswith(".eclass"):
-                                               eclass_filenames.append(y)
+                               eclass_filenames = os.listdir(x)
                        except OSError, e:
-                               if e.errno == errno.ENOENT:
-                                       del e
-                                       continue
-                               elif e.errno == errno.ENOTDIR:
+                               if e.errno in ignored_listdir_errnos:
                                        del e
                                        continue
                                elif e.errno == PermissionDenied.errno:
                                        raise PermissionDenied(x)
                                raise
                        for y in eclass_filenames:
+                               if not y.endswith(".eclass"):
+                                       continue
                                try:
                                        mtime = long(os.stat(os.path.join(x, y)).st_mtime)
                                except OSError: