Author: tross
Date: Tue Sep 27 14:56:00 2011
New Revision: 1176415
URL: http://svn.apache.org/viewvc?rev=1176415&view=rev
Log:
QPID-3506 - Improved error handling in CLI parse.
Modified:
qpid/trunk/qpid/tools/src/py/qmf-tool
Modified: qpid/trunk/qpid/tools/src/py/qmf-tool
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qmf-tool?rev=1176415&r1=1176414&r2=1176415&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/py/qmf-tool (original)
+++ qpid/trunk/qpid/tools/src/py/qmf-tool Tue Sep 27 14:56:00 2011
@@ -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()
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
