depgraph: use _match_slot in multislot match
authorZac Medico <zmedico@gentoo.org>
Fri, 26 Oct 2012 17:13:16 +0000 (10:13 -0700)
committerZac Medico <zmedico@gentoo.org>
Fri, 26 Oct 2012 17:13:16 +0000 (10:13 -0700)
This amkes sub-slot matching work correctly.

pym/_emerge/depgraph.py

index fd5dfe80655ffea3e2b59905e391c59af7f4115a..952d0618dc48122e3baa73c3182d39c8c9bea5cc 100644 (file)
@@ -3853,8 +3853,8 @@ class depgraph(object):
                                        for other_db, other_type, other_built, \
                                                other_installed, other_keys in dbs:
                                                try:
-                                                       if atom.slot == \
-                                                               other_db._pkg_str(_unicode(cpv), None).slot:
+                                                       if portage.dep._match_slot(atom,
+                                                               other_db._pkg_str(_unicode(cpv), None)):
                                                                slot_available = True
                                                                break
                                                except (KeyError, InvalidData):