From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 20 Jul 2009 22:11:40 +0000 (-0000)
Subject: Skip Blocker instances inside _add_prefetchers().
X-Git-Tag: v2.2_rc34~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e7bcec0ac746c747d20f5d41199c1cc3b9ba615e;p=portage.git

Skip Blocker instances inside _add_prefetchers().

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

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 246ed2a71..9228ab6f4 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -637,7 +637,8 @@ class Scheduler(PollScheduler):
 			# at the beginning, which annoy users, never
 			# spawn a prefetcher for the first package.
 			for pkg in self._mergelist[1:]:
-				if pkg.operation == "uninstall":
+				# mergelist can contain solved Blocker instances
+				if not isinstance(pkg, Package) or pkg.operation == "uninstall":
 					continue
 				prefetcher = self._create_prefetcher(pkg)
 				if prefetcher is not None: