From 60a2919b5d2b035ee0036de27bfa7aca4796e364 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 11 Mar 2009 07:44:10 +0000 Subject: 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 --- bin/emerge | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'bin') 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) -- cgit v1.2.3-1-g7c22