diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 07:44:10 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 07:44:10 +0000 |
commit | 60a2919b5d2b035ee0036de27bfa7aca4796e364 (patch) | |
tree | 43d351df9e4a0924ce2df406ee4d34f6e71f11e5 /bin/emerge | |
parent | 1878f4a0e87a105262ea0595d3457b4c7b3b459d (diff) | |
download | portage-60a2919b5d2b035ee0036de27bfa7aca4796e364.tar.gz portage-60a2919b5d2b035ee0036de27bfa7aca4796e364.tar.bz2 portage-60a2919b5d2b035ee0036de27bfa7aca4796e364.zip |
Bug #261852 - If an unexpected exception is raise from emerge_main() then
show the traceback after the mod_echo output to that the traceback isn't
obscured by mod_echo flooding. (trunk r12814)
svn path=/main/branches/2.1.6/; revision=13046
Diffstat (limited to 'bin/emerge')
-rwxr-xr-x | bin/emerge | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge index b07ad9e0e..b95a2f5b2 100755 --- a/bin/emerge +++ b/bin/emerge @@ -44,4 +44,20 @@ if __name__ == "__main__": except ParseError, e: sys.stderr.write("%s\n" % str(e)) sys.exit(1) + except SystemExit: + raise + except Exception: + # If an unexpected exception occurs then we don't want the mod_echo + # output to obscure the traceback, so dump the mod_echo output before + # showing the traceback. + import traceback + tb_str = traceback.format_exc() + try: + from portage.elog import mod_echo + except ImportError: + pass + else: + mod_echo.finalize() + sys.stderr.write(tb_str) + sys.exit(1) sys.exit(retval) |