From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 2 May 2008 18:27:16 +0000 (-0000)
Subject: Validate resume list data some more.
X-Git-Tag: v2.2_pre6~50
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dca018ce6500736ac9af8faa7fefd2717ecabf7b;p=portage.git

Validate resume list data some more.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index e8f59ed36..faa0a83e8 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4763,7 +4763,7 @@ class depgraph(object):
 		trees = self.trees
 		serialized_tasks = []
 		for x in mergelist:
-			if len(x) != 4:
+			if not (isinstance(x, list) and len(x) == 4):
 				continue
 			pkg_type, myroot, pkg_key, action = x
 			if pkg_type not in self.pkg_tree_map: