From e80da193f6b84007ed1a168564aa81bf88b68926 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Tue, 27 Sep 2011 14:56:00 +0000 Subject: QPID-3506 - Improved error handling in CLI parse. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1176415 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/tools/src/py/qmf-tool | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'qpid') diff --git a/qpid/tools/src/py/qmf-tool b/qpid/tools/src/py/qmf-tool index 3127c2a77b..894dc9cc7d 100755 --- a/qpid/tools/src/py/qmf-tool +++ b/qpid/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() -- cgit v1.2.1