summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-02-13 02:53:53 +0000
committerZac Medico <zmedico@gentoo.org>2009-02-13 02:53:53 +0000
commitab045e2584bee3148fa9c7c8842f9e304d2428b5 (patch)
tree1ce4d50bf5858fa63f188374534e0fd9a84ffa8b
parent7411bc1bde9734df9eb00b19044929e4047b8652 (diff)
downloadportage-ab045e2584bee3148fa9c7c8842f9e304d2428b5.tar.gz
portage-ab045e2584bee3148fa9c7c8842f9e304d2428b5.tar.bz2
portage-ab045e2584bee3148fa9c7c8842f9e304d2428b5.zip
Fix Scheduler._prevent_builddir_collisions() to skip non-Package instances
when necessary. svn path=/main/trunk/; revision=12604
-rw-r--r--pym/_emerge/__init__.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a6d9ec257..52a307eb8 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -10041,6 +10041,9 @@ class Scheduler(PollScheduler):
"""
cpv_map = {}
for pkg in self._mergelist:
+ if not isinstance(pkg, Package):
+ # a satisfied blocker
+ continue
if pkg.installed:
continue
if pkg.cpv not in cpv_map: