Ignore non-existent directories for bug #171809. This is required for readonly mode.

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

diff --git a/pym/portage/cache/flat_hash.py b/pym/portage/cache/flat_hash.py
index 24998a6d38548cc69b25710ce2a2b520dd0e8cbc..05b900ea86fd3dfd5636d9f7ed06fa6851db6689 100644 (file)
--- a/pym/portage/cache/flat_hash.py
+++ b/pym/portage/cache/flat_hash.py
@@ -107,7 +107,15 @@ class database(fs_template.FsBased):
                dirs = [self.location]
                len_base = len(self.location)
                while len(dirs):
-                       for l in os.listdir(dirs[0]):
+                       try:
+                               dir_list = os.listdir(dirs[0])
+                       except OSError, e:
+                               if e.errno != errno.ENOENT:
+                                       raise
+                               del e
+                               dirs.pop(0)
+                               continue
+                       for l in dir_list:
                                if l.endswith(".cpickle"):
                                        continue
                                p = os.path.join(dirs[0],l)