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 d472034278df7e04c67c2c88f9f4ca940bf848d1..7bfad6d238c41ea61b76dc78cddd1c3c0a0458e5 100755 (executable)
--- 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()