summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorJason Gerard DeRose <jderose@redhat.com>2009-04-28 15:46:23 -0600
committerRob Crittenden <rcritten@redhat.com>2009-04-28 22:29:10 -0400
commit3f4a0a2d7739dc4355313742f4b996face344d7a (patch)
tree3086883adaf716a8f3fbc54bdc1ced88e540e5d5 /ipalib
parentb7438c3da29cc2bd190da8c656bf4f0c85da5019 (diff)
downloadfreeipa-3f4a0a2d7739dc4355313742f4b996face344d7a.tar.gz
freeipa-3f4a0a2d7739dc4355313742f4b996face344d7a.tar.xz
freeipa-3f4a0a2d7739dc4355313742f4b996face344d7a.zip
Fixed cli.run() catching SystemExit exception under Python2.4
Resolves BZ #498088
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/cli.py2
1 files changed, 1 insertions, 1 deletions
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: