summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-08-01 18:00:47 +0000
committerZac Medico <zmedico@gentoo.org>2007-08-01 18:00:47 +0000
commit14130d66fe82a147b52eaef1e410393be42d51dc (patch)
tree6fa1b2b2a874551a2860971f7a90bbfa6005d6c5
parenta5de83bc81c775dc658de180e6692052945548f9 (diff)
downloadportage-14130d66fe82a147b52eaef1e410393be42d51dc.tar.gz
portage-14130d66fe82a147b52eaef1e410393be42d51dc.tar.bz2
portage-14130d66fe82a147b52eaef1e410393be42d51dc.zip
For bug #187375, handle an ImportError when portage is downgraded to a version without mod_echo.
svn path=/main/trunk/; revision=7535
-rw-r--r--pym/emerge/__init__.py8
1 files changed, 6 insertions, 2 deletions
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)