diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-20 22:18:23 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-20 22:18:23 +0000 |
| commit | 9f952450551ade43935456154f07ef79a1f859bb (patch) | |
| tree | 24e476e16e2998374e3c0d2d4133d2b5094fbe02 /bin/emerge | |
| parent | 14e1600adf12c4174c8b6c43f483ad7ce37b1765 (diff) | |
| download | portage-9f952450551ade43935456154f07ef79a1f859bb.tar.gz portage-9f952450551ade43935456154f07ef79a1f859bb.tar.bz2 portage-9f952450551ade43935456154f07ef79a1f859bb.zip | |
Fix blocker handling to properly handle SLOT atoms in
depgraph.validate_blockers(). (trunk r8495)
svn path=/main/branches/2.1.2/; revision=8555
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 70bb6403e..611b4abfd 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2270,7 +2270,9 @@ class depgraph: slot_atom in modified_slots[myroot]: replacement = final_db.match(slot_atom) if replacement: - if not portage.match_from_list(mydep, replacement): + slot = portage_dep.dep_getslot(slot_atom) + if not portage.match_from_list( + mydep, ["%s:%s" % (replacement[0], slot)]): # Apparently a replacement may be able to # invalidate this block. replacement_node = \ |