diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 05:08:02 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 05:08:02 +0000 |
| commit | 3d3e7323e1467f499cbea48935e2c53891c5e396 (patch) | |
| tree | 7cc9a451a70b0b7296c1ac232c3f5afececc815e | |
| parent | 1c9620566480cfb4ce708d73c45297835bc66c3c (diff) | |
| download | portage-3d3e7323e1467f499cbea48935e2c53891c5e396.tar.gz portage-3d3e7323e1467f499cbea48935e2c53891c5e396.tar.bz2 portage-3d3e7323e1467f499cbea48935e2c53891c5e396.zip | |
Fix Scheduler._prevent_builddir_collisions() to skip non-Package instances
when necessary. (trunk r12604)
svn path=/main/branches/2.1.6/; revision=12885
| -rw-r--r-- | pym/_emerge/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 1ba3341fa..61a41529d 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -10025,6 +10025,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: |