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

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

svn path=/main/branches/2.1.2/; revision=7536
---

diff --git a/bin/emerge b/bin/emerge
index fb4fbe7e3..790cd14fd 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4342,8 +4342,12 @@ def post_emerge(settings, mtimedb, retval):
 
 	# Dump the mod_echo output now so that our other notifications are shown
 	# last.
-	from elog_modules import mod_echo
-	mod_echo.finalize()
+	try:
+		from elog_modules 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)