From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 1 Aug 2007 18:00:47 +0000 (-0000)
Subject: For bug #187375, handle an ImportError when portage is downgraded to a version withou... 
X-Git-Tag: v2.2_pre1~913
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14130d66fe82a147b52eaef1e410393be42d51dc;p=portage.git

For bug #187375, handle an ImportError when portage is downgraded to a version without mod_echo.

svn path=/main/trunk/; revision=7535
---

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 74d83220c..8b0f8a59e 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -4342,8 +4342,12 @@ def post_emerge(trees, mtimedb, retval):
 
 	# Dump the mod_echo output now so that our other notifications are shown
 	# last.
-	from portage.elog import mod_echo
-	mod_echo.finalize()
+	try:
+		from portage.elog import mod_echo
+	except ImportError:
+		pass # happens during downgrade to a version without the module
+	else:
+		mod_echo.finalize()
 
 	if "noinfo" not in settings.features:
 		chk_updated_info_files(target_root, infodirs, info_mtimes, retval)