[gentoo-commits] proj/portage:master commit in: pym/portage/cache/

["Zac Medico" <zmedico@gentoo.org>]

commit:     1b367f9121b7c9cdceab644539b329c501e539c2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 18:59:45 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed May 23 18:59:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1b367f91

validate_entry: handle KeyError for bug #417253

This error is triggered by corrupt cache entries.

---
 pym/portage/cache/template.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/pym/portage/cache/template.py b/pym/portage/cache/template.py
index 0af6c20..0ab6e0a 100644
--- a/pym/portage/cache/template.py
+++ b/pym/portage/cache/template.py
@@ -194,8 +194,13 @@ class database(object):
 
 	def validate_entry(self, entry, ebuild_hash, eclass_db):
 		hash_key = '_%s_' % self.validation_chf
-		if entry[hash_key] != getattr(ebuild_hash, self.validation_chf):
+		try:
+			entry_hash = entry[hash_key]
+		except KeyError:
 			return False
+		else:
+			if entry_hash != getattr(ebuild_hash, self.validation_chf):
+				return False
 		update = eclass_db.validate_and_rewrite_cache(entry['_eclasses_'], self.validation_chf,
 			self.store_eclass_paths)
 		if update is None: