Handle CacheCorruption from self.db_ro in _setitem, triggered by INHERITED

containing non-existent eclass inside metadata.database._parse_data. Thanks
to Vlastimil Babka <caster@g.o> for reporting. (trunk r15412)

svn path=/main/branches/2.1.7/; revision=15634

diff --git a/pym/portage/cache/metadata_overlay.py b/pym/portage/cache/metadata_overlay.py
index 84c5a9741ef5c6bea7009636a734567b827b1d5f..7b4f70a9cae986e9d569969a1a17b871c8d970b4 100644 (file)
--- a/pym/portage/cache/metadata_overlay.py
+++ b/pym/portage/cache/metadata_overlay.py
@@ -48,7 +48,10 @@ class database(template.database):
                        return value
 
        def _setitem(self, name, values):
-               value_ro = self.db_ro.get(name, None)
+               try:
+                       value_ro = self.db_ro.get(name)
+               except CacheCorruption:
+                       value_ro = None
                if value_ro is not None and \
                        self._are_values_identical(value_ro, values):
                        # we have matching values in the underlying db_ro