diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-07-30 03:00:20 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-07-30 03:00:20 +0000 |
commit | 72145ac0d9ba439e663b8267f691125dece74499 (patch) | |
tree | ec3cf4e66ef31c20c9b82b0dc68cf45e72555355 /bin/emerge | |
parent | 6c39b7d4492c301e53c8d67f9b9b4c3930f21f65 (diff) | |
download | portage-72145ac0d9ba439e663b8267f691125dece74499.tar.gz portage-72145ac0d9ba439e663b8267f691125dece74499.tar.bz2 portage-72145ac0d9ba439e663b8267f691125dece74499.zip |
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
Diffstat (limited to 'bin/emerge')
-rwxr-xr-x | bin/emerge | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index 7023f02a8..e1209640e 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() |