diff options
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/FakeVartree.py | 15 | ||||
| -rw-r--r-- | pym/_emerge/actions.py | 7 |
2 files changed, 10 insertions, 12 deletions
diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py index 1d6a1aa67..0db2cd412 100644 --- a/pym/_emerge/FakeVartree.py +++ b/pym/_emerge/FakeVartree.py @@ -114,14 +114,13 @@ class FakeVartree(vartree): portage.locks.unlockdir(vdb_lock) # Populate the old-style virtuals using the cached values. - if not self.settings.treeVirtuals: - # Skip the aux_get wrapper here, to avoid unwanted - # cache generation. - try: - self.dbapi.aux_get = self._aux_get - self.settings._populate_treeVirtuals(self) - finally: - self.dbapi.aux_get = self._aux_get_wrapper + # Skip the aux_get wrapper here, to avoid unwanted + # cache generation. + try: + self.dbapi.aux_get = self._aux_get + self.settings._populate_treeVirtuals_if_needed(self) + finally: + self.dbapi.aux_get = self._aux_get_wrapper def _sync(self): diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 70b06c654..1f00cb3a6 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2803,10 +2803,9 @@ def display_news_notification(root_config, myopts): if "news" not in settings.features: return - if not settings.treeVirtuals: - # Populate these using our existing vartree, to avoid - # having a temporary one instantiated. - settings._populate_treeVirtuals(trees["vartree"]) + # Populate these using our existing vartree, to avoid + # having a temporary one instantiated. + settings._populate_treeVirtuals_if_needed(trees["vartree"]) for repo in portdb.getRepositories(): unreadItems = checkUpdatedNewsItems( |