diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-08-29 13:23:22 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-08-29 13:23:22 -0700 |
| commit | 78ba7f0d3a3a2defdf9807ef2e8138965490a2fc (patch) | |
| tree | 10a549acf3569d3104291e38927cd8318318da09 /pym/_emerge/resolver/slot_collision.py | |
| parent | 9f14ed80e65a18da06e0834961ea032e3e830319 (diff) | |
| download | portage-78ba7f0d3a3a2defdf9807ef2e8138965490a2fc.tar.gz portage-78ba7f0d3a3a2defdf9807ef2e8138965490a2fc.tar.bz2 portage-78ba7f0d3a3a2defdf9807ef2e8138965490a2fc.zip | |
Rename slot-abi stuff to refer to slot-operator.
This makes it consistent with the language in the PMS eapi-5 branch:
http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=5d6749ac9e5ddc5b1daaad7737b65fa81c6ece47
Diffstat (limited to 'pym/_emerge/resolver/slot_collision.py')
| -rw-r--r-- | pym/_emerge/resolver/slot_collision.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index 783a6483d..bc95e916e 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -291,8 +291,8 @@ class slot_conflict_handler(object): num_all_specific_atoms += 1 collision_reasons[key] = atoms else: - # The slot_abi does not match. - key = ("sub-slot", atom.slot_abi) + # The sub_slot does not match. + key = ("sub-slot", atom.sub_slot) atoms = collision_reasons.get(key, set()) atoms.add((ppkg, atom, other_pkg)) num_all_specific_atoms += 1 |