summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2011-09-27 14:56:00 +0000
committerTed Ross <tross@apache.org>2011-09-27 14:56:00 +0000
commita0f7c476695adb299bf937bf6350e8f85488001a (patch)
tree26bf749db2405955e5f2f68797274fce15627111
parent60545fd0787cbba234d01606a195495a58222fef (diff)
downloadqpid-python-a0f7c476695adb299bf937bf6350e8f85488001a.tar.gz
QPID-3506 - Improved error handling in CLI parse.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1176415 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xtools/src/py/qmf-tool12
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/src/py/qmf-tool b/tools/src/py/qmf-tool
index 3127c2a77b..894dc9cc7d 100755
--- a/tools/src/py/qmf-tool
+++ b/tools/src/py/qmf-tool
@@ -88,7 +88,7 @@ class OptsAndArgs(object):
key, val = x.split('=')
conn_options.append("%s:%s" % (key, val))
except:
- raise BaseException("Improperly formatted text for --conn-option: '%s'" % x)
+ raise Exception("Improperly formatted text for --conn-option: '%s'" % x)
if options.domain:
qmf_options.append("domain:'%s'" % options.domain)
@@ -99,7 +99,7 @@ class OptsAndArgs(object):
key, val = x.split('=')
qmf_options.append("%s:%s" % (key, val))
except:
- raise BaseException("Improperly formatted text for --qmf-option: '%s'" % x)
+ raise Exception("Improperly formatted text for --qmf-option: '%s'" % x)
conn_string = '{'
first = True
@@ -754,8 +754,12 @@ class QmfData:
#=========================================================
# Main Program
#=========================================================
-oa = OptsAndArgs(sys.argv)
-host, conn_options, qmf_options = oa.parse()
+try:
+ oa = OptsAndArgs(sys.argv)
+ host, conn_options, qmf_options = oa.parse()
+except Exception, e:
+ print "Parse Error: %s" % e
+ sys.exit(1)
disp = Display()