From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 16 Apr 2012 07:15:56 +0000 (-0700)
Subject: Avoid redundant news display for bug #412161.
X-Git-Tag: v2.2.0_alpha101~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b61f053253076873e7c181e4cfad2038aa6f7283;p=portage.git

Avoid redundant news display for bug #412161.
---

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 0fbc4b7f7..7fbe84f01 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -381,7 +381,9 @@ def post_emerge(myaction, myopts, myfiles,
 	_flush_elog_mod_echo()
 
 	if not vardbapi._pkgs_changed:
-		display_news_notification(root_config, myopts)
+		# GLEP 42 says to display news *after* an emerge --pretend
+		if "--pretend" in myopts:
+			display_news_notification(root_config, myopts)
 		# If vdb state has not changed then there's nothing else to do.
 		return
 
@@ -2033,6 +2035,7 @@ def emerge_main(args=None):
 				level=logging.ERROR, noiselevel=-1)
 			return 1
 
+		# GLEP 42 says to display news *after* an emerge --pretend
 		if "--pretend" not in myopts:
 			display_news_notification(root_config, myopts)
 		retval = action_build(settings, trees, mtimedb,