From 2be65f56d7b82430679e068756cc3d10b0855d47 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Fri, 23 May 2008 13:29:42 +0000 Subject: qpid-tool fixed to cleanly handle brokers with management disabled git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@659535 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/python/commands/qpid-tool | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'qpid/python/commands') diff --git a/qpid/python/commands/qpid-tool b/qpid/python/commands/qpid-tool index 478e362aaf..bf16faac42 100755 --- a/qpid/python/commands/qpid-tool +++ b/qpid/python/commands/qpid-tool @@ -164,16 +164,16 @@ try: except socket.error, e: print "Socket Error (%s):" % _host, e[1] sys.exit (1) -except Closed, e: - if str(e).find ("Exchange not found") != -1: - print "Management not enabled on broker: Use '-m yes' option on broker startup." - sys.exit (1) except IOError, e: print "IOError: %d - %s: %s" % (e.errno, e.strerror, e.filename) sys.exit (1) except ConnectionFailed, e: print "Connect Failed %d - %s" % (e[0], e[1]) sys.exit(1) +except Exception, e: + if str(e).find ("Exchange not found") != -1: + print "Management not enabled on broker: Use '-m yes' option on broker startup." + sys.exit(1) # Instantiate the CLI interpreter and launch it. cli = Mcli (data, disp) -- cgit v1.2.1