diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-03-02 20:51:44 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-02 20:51:44 +0000 |
| commit | 2d531284c8b51acd63614b44ee0b611d5bf4bfb5 (patch) | |
| tree | a34ced9205c70817beb762fa51630c88441331e1 | |
| parent | da0f211a45ca07ad20ef34583fc3b57cedae3535 (diff) | |
| download | portage-2d531284c8b51acd63614b44ee0b611d5bf4bfb5.tar.gz portage-2d531284c8b51acd63614b44ee0b611d5bf4bfb5.tar.bz2 portage-2d531284c8b51acd63614b44ee0b611d5bf4bfb5.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. (trunk r15412)
svn path=/main/branches/2.1.7/; revision=15634
| -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 |