From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 26 Oct 2012 17:13:16 +0000 (-0700)
Subject: depgraph: use _match_slot in multislot match
X-Git-Tag: v2.2.0_alpha142~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3fcf296fdda7fa3f7c36d4d4c3ab55156fcd70fa;p=portage.git

depgraph: use _match_slot in multislot match

This amkes sub-slot matching work correctly.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index fd5dfe806..952d0618d 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -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):