diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-11-30 16:46:52 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-30 16:46:52 -0800 |
| commit | a4976af2dc54db01a0c094e021ed8a776969c878 (patch) | |
| tree | 92acd858aec32eae8608b43dcaf12a8e6bd4effe | |
| parent | 4deaa35787bfc52ec937f7ba9714706d9ac20da2 (diff) | |
| download | portage-a4976af2dc54db01a0c094e021ed8a776969c878.tar.gz portage-a4976af2dc54db01a0c094e021ed8a776969c878.tar.bz2 portage-a4976af2dc54db01a0c094e021ed8a776969c878.zip | |
fix AttributeError in recent use dep changes
| -rw-r--r-- | pym/portage/dbapi/__init__.py | 4 | ||||
| -rw-r--r-- | pym/portage/dep/__init__.py | 36 |
2 files changed, 22 insertions, 18 deletions
diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py index 4534cc731..94fbc47b0 100644 --- a/pym/portage/dbapi/__init__.py +++ b/pym/portage/dbapi/__init__.py @@ -171,7 +171,9 @@ class dbapi(object): break if missing_iuse: continue - if not self._use_mutable: + if not atom.use: + pass + elif not self._use_mutable: missing_enabled = atom.use.missing_enabled.difference(iuse) missing_disabled = atom.use.missing_disabled.difference(iuse) diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index baf0fc3fc..1f956e39b 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -1936,26 +1936,28 @@ def match_from_list(mydep, candidate_list): mydep.unevaluated_atom.use.required): continue - missing_enabled = mydep.use.missing_enabled.difference(x.iuse.all) - missing_disabled = mydep.use.missing_disabled.difference(x.iuse.all) - - if mydep.use.enabled: - if mydep.use.enabled.intersection(missing_disabled): - continue - need_enabled = mydep.use.enabled.difference(use.enabled) - if need_enabled: - need_enabled = need_enabled.difference(missing_enabled) - if need_enabled: + if mydep.use: + + missing_enabled = mydep.use.missing_enabled.difference(x.iuse.all) + missing_disabled = mydep.use.missing_disabled.difference(x.iuse.all) + + if mydep.use.enabled: + if mydep.use.enabled.intersection(missing_disabled): continue + need_enabled = mydep.use.enabled.difference(use.enabled) + if need_enabled: + need_enabled = need_enabled.difference(missing_enabled) + if need_enabled: + continue - if mydep.use.disabled: - if mydep.use.disabled.intersection(missing_enabled): - continue - need_disabled = mydep.use.disabled.intersection(use.enabled) - if need_disabled: - need_disabled = need_disabled.difference(missing_disabled) - if need_disabled: + if mydep.use.disabled: + if mydep.use.disabled.intersection(missing_enabled): continue + need_disabled = mydep.use.disabled.intersection(use.enabled) + if need_disabled: + need_disabled = need_disabled.difference(missing_disabled) + if need_disabled: + continue mylist.append(x) |