summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik M. Bray <embray@stsci.edu>2013-04-09 15:20:19 +0000
committerErik M. Bray <embray@stsci.edu>2013-04-09 15:20:19 +0000
commitd1d4f9c2344d1efe655c9068774fcf7cb42bd053 (patch)
treee903543fbfc63ed5e492176a64b30cf9d81cbec6
parentba33408cb532c772b1723f71118ce63c4808959e (diff)
downloadpbr-d1d4f9c2344d1efe655c9068774fcf7cb42bd053.tar.gz
When catching exceptions from a setup-hook don't throw a traceback up for sys.exit()
git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@24204 fe389314-cf27-0410-b35b-8c050e845b92
-rw-r--r--pbr/d2to1/util.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pbr/d2to1/util.py b/pbr/d2to1/util.py
index ab38d66..8ffd806 100644
--- a/pbr/d2to1/util.py
+++ b/pbr/d2to1/util.py
@@ -180,6 +180,8 @@ def cfg_to_args(path='setup.cfg'):
hook_fn = resolve_name(hook)
try :
hook_fn(config)
+ except SystemExit:
+ log.error('setup hook %s terminated the installation')
except:
e = sys.exc_info()[1]
log.error('setup hook %s raised exception: %s\n' %