diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-04 09:29:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-04 09:29:13 +0000 |
| commit | 77fa8b9c136c3921e001173a81c54639ff416a75 (patch) | |
| tree | 2edbb8a4055ae67f6c13e972b5d5a2d2819cbc8d | |
| parent | a53e5226e49a6a8b1ba32d8ef29375e3952dc759 (diff) | |
| download | portage-77fa8b9c136c3921e001173a81c54639ff416a75.tar.gz portage-77fa8b9c136c3921e001173a81c54639ff416a75.tar.bz2 portage-77fa8b9c136c3921e001173a81c54639ff416a75.zip | |
Improve support for slot deps atoms given on the command line. Thanks to Flameeyes for reporting.
svn path=/main/trunk/; revision=6730
| -rw-r--r-- | pym/emerge/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index f14836dc1..67d70bee1 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -1080,8 +1080,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 @@ -1093,6 +1092,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() |