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 4b24aad59fe5529e33d739d8dee9fcee393c0057..eab4168802d34ce1f9b3690c85722915075bddc3 100644 (file)
--- 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
-