summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-09-06 10:18:27 +0000
committerZac Medico <zmedico@gentoo.org>2009-09-06 10:18:27 +0000
commitd8cdec9767e8c5899975acab47b3370555d1a951 (patch)
treef4c51a46f56c06aa33504f2577df66679bac1f60
parentbec027318abfd293bea1d743dd8d2fa47aae0f2e (diff)
downloadportage-d8cdec9767e8c5899975acab47b3370555d1a951.tar.gz
portage-d8cdec9767e8c5899975acab47b3370555d1a951.tar.bz2
portage-d8cdec9767e8c5899975acab47b3370555d1a951.zip
In display_news_notification(), use the exising vartree instance to populate
settings.treeVirtuals, to avoid having a temporary one instantiated. Thanks to Marat Radchenko <slonopotamusorama@gmail.com> for reporting. svn path=/main/trunk/; revision=14208
-rw-r--r--pym/_emerge/actions.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 399ff1001..f8c511a66 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2626,6 +2626,12 @@ def display_news_notification(root_config, myopts):
newsReaderDisplay = False
update = "--pretend" not in myopts
+ if not settings.treeVirtuals:
+ # Populate these using our existing vartree, to avoid
+ # having a temporary one instantiated.
+ settings.treeVirtuals = portage.util.map_dictlist_vals(
+ portage.getCPFromCPV, trees["vartree"].get_all_provides())
+
for repo in portdb.getRepositories():
unreadItems = checkUpdatedNewsItems(
portdb, vardb, NEWS_PATH, UNREAD_PATH, repo, update=update)