diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-02-20 21:10:47 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-02-20 21:10:47 +0000 |
| commit | 67e7d29b6e7867ff8b23f4bb43370f27a3cf942b (patch) | |
| tree | 84cc662ea8a2f2d0ad49f5c49c0882878e7b4ec5 | |
| parent | 6578bc5b39bc6b24eace259d7e099864db0fecf1 (diff) | |
| download | portage-67e7d29b6e7867ff8b23f4bb43370f27a3cf942b.tar.gz portage-67e7d29b6e7867ff8b23f4bb43370f27a3cf942b.tar.bz2 portage-67e7d29b6e7867ff8b23f4bb43370f27a3cf942b.zip | |
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.
svn path=/main/trunk/; revision=15412
| -rw-r--r-- | pym/portage/cache/metadata_overlay.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/cache/metadata_overlay.py b/pym/portage/cache/metadata_overlay.py index 84c5a9741..7b4f70a9c 100644 --- 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 |