Improve support for slot deps atoms given on the command line. (branches/2.1.2 r6731)

svn path=/main/branches/2.1.2.9/; revision=7442

diff --git a/bin/emerge b/bin/emerge
index 7023f02a842d9b3f0cbe5050a74e53b6dd96d2fe..e1209640e6228fe41655b271ba18725d16323241 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()