diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-01-29 18:52:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-01-29 18:52:04 +0000 |
| commit | a613a634821cdd2bf9f4846c3ebf42b5158f27d0 (patch) | |
| tree | cd7d3a6d6a3f7ee729760b1f0fbb1f87961a307d /bin | |
| parent | 3dec70f6e1c7dcf1b345ea6faffc26e12b0daac6 (diff) | |
| download | portage-a613a634821cdd2bf9f4846c3ebf42b5158f27d0.tar.gz portage-a613a634821cdd2bf9f4846c3ebf42b5158f27d0.tar.bz2 portage-a613a634821cdd2bf9f4846c3ebf42b5158f27d0.zip | |
Add an Atom.evaluate_conditionals() method and use where appropriate.
(trunk r15212)
svn path=/main/branches/2.1.7/; revision=15263
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/portageq | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/bin/portageq b/bin/portageq index 9fbf3c9bc..909876cc8 100755 --- a/bin/portageq +++ b/bin/portageq @@ -49,11 +49,7 @@ from portage.util import writemsg, writemsg_stdout def eval_atom_use(atom): if atom.use.conditional and 'USE' in os.environ: use = os.environ['USE'].split() - evaluated_atom = portage.dep.remove_slot(atom) - if atom.slot: - evaluated_atom += ":%s" % atom.slot - evaluated_atom += str(atom.use.evaluate_conditionals(use)) - atom = portage.dep.Atom(evaluated_atom) + atom = atom.evaluate_conditionals(use) return atom #----------------------------------------------------------------------------- |