From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 13 Aug 2009 18:10:07 +0000 (-0000)
Subject: Bug #281355 - Handle IndexError inside reconstruct_eclasses().
X-Git-Tag: v2.2_rc39~90
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dbe11e93f1ab109f2bf16caa3fccc6bdaad49d81;p=portage.git

Bug #281355 - Handle IndexError inside reconstruct_eclasses().

svn path=/main/trunk/; revision=14015
---

diff --git a/pym/portage/cache/template.py b/pym/portage/cache/template.py
index e78216338..97adb1058 100644
--- a/pym/portage/cache/template.py
+++ b/pym/portage/cache/template.py
@@ -224,6 +224,9 @@ def reconstruct_eclasses(cpv, eclass_string):
 			# The old format contains paths that will be discarded.
 			for x in xrange(0, len(eclasses), 3):
 				d[eclasses[x]] = (eclasses[x + 1], long(eclasses[x + 2]))
+	except IndexError:
+		raise cache_errors.CacheCorruption(cpv,
+			"_eclasses_ was of invalid len %i" % len(eclasses))
 	except ValueError:
 		raise cache_errors.CacheCorruption(cpv, "_eclasses_ mtime conversion to long failed")
 	del eclasses