From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 12 Dec 2008 21:20:59 +0000 (-0000)
Subject: Avoid TypeError in BlockerCache.__iter__() that's triggered with
X-Git-Tag: v2.1.6.1~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=10bfa44a67311ed448db11dd42ade818a0465d16;p=portage.git

Avoid TypeError in BlockerCache.__iter__() that's triggered with
FEATURES=python-trace. Thanks to Fabian Groffen <grobian@g.o> for reporting.
(trunk r12180)

svn path=/main/branches/2.1.6/; revision=12216
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 36670f69a..5acd3be80 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3874,6 +3874,9 @@ class BlockerCache(DictMixin):
 		self._modified.add(cpv)
 
 	def __iter__(self):
+		if self._cache_data is None:
+			# triggered by python-trace
+			return iter([])
 		return iter(self._cache_data["blockers"])
 
 	def __delitem__(self, cpv):