From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 4 Jun 2007 09:45:49 +0000 (-0000)
Subject: Improve support for slot deps atoms given on the command line. (trunk r6730)
X-Git-Tag: v2.1.2.10~20
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4c48b02da784ee320a561e6e9b4ad36f2f27f201;p=portage.git

Improve support for slot deps atoms given on the command line. (trunk r6730)

svn path=/main/branches/2.1.2/; revision=6731
---

diff --git a/bin/emerge b/bin/emerge
index d47203427..7bfad6d23 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1077,8 +1077,7 @@ class depgraph:
 				self.blocker_parents.setdefault(
 					tuple(mybigkey), set()).add(myparent)
 			return 1
-		if not arg and myroot == self.target_root:
-			arg = portage.best_match_to_list(mykey, self.args_keys)
+
 		# select the correct /var database that we'll be checking against
 		vardbapi = self.trees[myroot]["vartree"].dbapi
 		portdb = self.trees[myroot]["porttree"].dbapi
@@ -1090,6 +1089,10 @@ class depgraph:
 
 		mydbapi = self.trees[myroot][self.pkg_tree_map[mytype]].dbapi
 
+		if not arg and myroot == self.target_root:
+			cpv_slot = "%s:%s" % (mykey, mydbapi.aux_get(mykey, ["SLOT"])[0])
+			arg = portage.best_match_to_list(cpv_slot, self.args_keys)
+
 		if myuse is None:
 			self.pkgsettings[myroot].setcpv(mykey, mydb=portdb)
 			myuse = self.pkgsettings[myroot]["USE"].split()