From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 21 Jul 2010 01:38:20 +0000 (-0700)
Subject: Move the mod_echo import to the top, so the module is pre-loaded.
X-Git-Tag: v2.2_rc68~482
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff84a3ce55e7f893b6686a1f7f027f7628238097;p=portage.git

Move the mod_echo import to the top, so the module is pre-loaded.
---

diff --git a/pym/_emerge/_flush_elog_mod_echo.py b/pym/_emerge/_flush_elog_mod_echo.py
index 4b24aad59..eab416880 100644
--- a/pym/_emerge/_flush_elog_mod_echo.py
+++ b/pym/_emerge/_flush_elog_mod_echo.py
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+from portage.elog import mod_echo
+
 def _flush_elog_mod_echo():
 	"""
 	Dump the mod_echo output now so that our other
@@ -8,13 +10,6 @@ def _flush_elog_mod_echo():
 	@rtype: bool
 	@returns: True if messages were shown, False otherwise.
 	"""
-	messages_shown = False
-	try:
-		from portage.elog import mod_echo
-	except ImportError:
-		pass # happens during downgrade to a version without the module
-	else:
-		messages_shown = bool(mod_echo._items)
-		mod_echo.finalize()
+	messages_shown = bool(mod_echo._items)
+	mod_echo.finalize()
 	return messages_shown
-