diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-01-28 05:37:57 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-01-28 05:37:57 +0000 |
| commit | b3222041e0eeca52708b36da8462b09160f48789 (patch) | |
| tree | 174a9929279b2c25a52eaee6885f98f81285ea07 /bin/portageq | |
| parent | 0d838ad5a25a409b96461e56b420b599b247c70a (diff) | |
| download | portage-b3222041e0eeca52708b36da8462b09160f48789.tar.gz portage-b3222041e0eeca52708b36da8462b09160f48789.tar.bz2 portage-b3222041e0eeca52708b36da8462b09160f48789.zip | |
Add an Atom.evaluate_conditionals() method and use where appropriate.
svn path=/main/trunk/; revision=15212
Diffstat (limited to 'bin/portageq')
| -rwxr-xr-x | bin/portageq | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/bin/portageq b/bin/portageq index 342e19fd2..e02a9ddbb 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 #----------------------------------------------------------------------------- |