diff options
| -rw-r--r-- | pym/portage/__init__.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 41da40cf7..720bf0d4b 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -2250,9 +2250,12 @@ class config(object): if mydb: if not hasattr(mydb, "aux_get"): for k in aux_keys: - v = mydb.get(k) - if v is not None: - pkg_configdict[k] = v + if k in mydb: + # Make these lazy, since __getitem__ triggers + # evaluation of USE conditionals which can't + # occur until PORTAGE_USE is calculated below. + pkg_configdict.addLazySingleton(k, + mydb.__getitem__, k) else: for k, v in izip(aux_keys, mydb.aux_get(self.mycpv, aux_keys)): pkg_configdict[k] = v |