From 3f4a0a2d7739dc4355313742f4b996face344d7a Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Tue, 28 Apr 2009 15:46:23 -0600 Subject: Fixed cli.run() catching SystemExit exception under Python2.4 Resolves BZ #498088 --- ipalib/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipalib/cli.py b/ipalib/cli.py index 4949a9b9f..378bc5715 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -675,7 +675,7 @@ def run(api): api.log.info('operation aborted') except PublicError, e: error = e - except Exception, e: + except StandardError, e: api.log.exception('%s: %s', e.__class__.__name__, str(e)) error = InternalError() if error is not None: -- cgit