diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-06-16 10:30:34 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-06-16 10:30:34 -0700 |
| commit | 707e125fe323f698430ea23bc8361f4d7290f4b7 (patch) | |
| tree | 8699ab0780968c322ec1f567f90dd3e4b5c74ba6 /pym/portage/dep/dep_check.py | |
| parent | 6938064ec0b64c2896cb849a385910cc558c4032 (diff) | |
| download | portage-707e125fe323f698430ea23bc8361f4d7290f4b7.tar.gz portage-707e125fe323f698430ea23bc8361f4d7290f4b7.tar.bz2 portage-707e125fe323f698430ea23bc8361f4d7290f4b7.zip | |
Add Atom._eval_qa_conditionals method, which unevaluated_atom support
that will be useful for repoman atom display.
Diffstat (limited to 'pym/portage/dep/dep_check.py')
| -rw-r--r-- | pym/portage/dep/dep_check.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index 73bcfabc0..f4a446118 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -76,13 +76,8 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", raise ParseError( _("invalid atom: '%s'") % (x,)) - if repoman and x.use and x.use.conditional: - evaluated_atom = remove_slot(x) - if x.slot: - evaluated_atom += ":%s" % x.slot - evaluated_atom += str(x.use._eval_qa_conditionals( - use_mask, use_force)) - x = Atom(evaluated_atom) + if repoman: + x = x._eval_qa_conditionals(use_mask, use_force) if not repoman and \ myuse is not None and isinstance(x, Atom) and x.use: |