diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-01-29 18:52:28 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-01-29 18:52:28 +0000 |
| commit | 8064fa121fce17426a4fca457206db721d7ad7d6 (patch) | |
| tree | 77f01ed9bcc3fc19cf1bce61eeb6ea9d71efc276 | |
| parent | 917d4486a46eedd768c0dba656ae9e61fbe2d54a (diff) | |
| download | portage-8064fa121fce17426a4fca457206db721d7ad7d6.tar.gz portage-8064fa121fce17426a4fca457206db721d7ad7d6.tar.bz2 portage-8064fa121fce17426a4fca457206db721d7ad7d6.zip | |
Fix AttributeError from has_versions for atoms with no USE deps. Thanks to
Arfrever for reporting. (trunk r15214)
svn path=/main/branches/2.1.7/; revision=15265
| -rwxr-xr-x | bin/portageq | 4 | ||||
| -rw-r--r-- | pym/portage/dep.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/portageq b/bin/portageq index 909876cc8..5cae93155 100755 --- a/bin/portageq +++ b/bin/portageq @@ -47,8 +47,8 @@ from portage import os 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() + if 'USE' in os.environ: + use = frozenset(os.environ['USE'].split()) atom = atom.evaluate_conditionals(use) return atom diff --git a/pym/portage/dep.py b/pym/portage/dep.py index c241408a5..fe3f04f59 100644 --- a/pym/portage/dep.py +++ b/pym/portage/dep.py @@ -620,7 +620,7 @@ class Atom(_atom_base): @rtype: Atom @return: an atom instance with any USE conditionals evaluated """ - if not self.use.conditional: + if not (self.use and self.use.conditional): return self atom = remove_slot(self) if self.slot: |