diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-08-01 18:05:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-08-01 18:05:15 +0000 |
| commit | e32ccbb0ad1fb01cca5c8d76a898820608daf619 (patch) | |
| tree | 228531d8db6236bfe3585d2d7afae7c1b351d39c /bin | |
| parent | d18a4181f91e2df1dd55ef346b6fb905154a8b11 (diff) | |
| download | portage-e32ccbb0ad1fb01cca5c8d76a898820608daf619.tar.gz portage-e32ccbb0ad1fb01cca5c8d76a898820608daf619.tar.bz2 portage-e32ccbb0ad1fb01cca5c8d76a898820608daf619.zip | |
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
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 8 |
1 files changed, 6 insertions, 2 deletions
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) |