summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJonathan Robie <jonathan@apache.org>2011-04-15 17:58:35 +0000
committerJonathan Robie <jonathan@apache.org>2011-04-15 17:58:35 +0000
commit584679acece2ebae5be533680a8485eb8d9483a2 (patch)
tree0ed9665c601a9f27765826d983ee3aa586cb549d /tools
parent009dcaf5a868e2ac7268b941057f5cf304918803 (diff)
downloadqpid-python-584679acece2ebae5be533680a8485eb8d9483a2.tar.gz
Fixes two errors in options:
1. Text for option -a / --broker-adr was wrong. 2. Name of --force-if-used was wrong. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1092780 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'tools')
-rwxr-xr-xtools/src/py/qpid-config4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/src/py/qpid-config b/tools/src/py/qpid-config
index 1c66d535b2..90c7ed10aa 100755
--- a/tools/src/py/qpid-config
+++ b/tools/src/py/qpid-config
@@ -159,7 +159,7 @@ def OptionsAndArguments(argv):
group1 = OptionGroup(parser, "General Options")
group1.add_option("-t", "--timeout", action="store", type="int", default=10, metavar="<secs>", help="Maximum time to wait for broker connection (in seconds)")
group1.add_option("-b", "--bindings", action="store_true", help="Show bindings in queue or exchange list")
- group1.add_option("-a", "--broker-addr", action="store", type="string", default="localhost:5672", metavar="<address>", help="Maximum time to wait for broker connection (in seconds)")
+ group1.add_option("-a", "--broker-addr", action="store", type="string", default="localhost:5672", metavar="<address>", help="Address of qpidd broker")
group1.add_option("--sasl-mechanism", action="store", type="string", metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL automatically picks the most secure available mechanism - use this option to override.")
parser.add_option_group(group1)
@@ -199,7 +199,7 @@ def OptionsAndArguments(argv):
group5 = OptionGroup(parser, "Options for Deleting Queues")
group5.add_option("--force", action="store_true", help="Force delete of queue even if it's currently used or it's not empty")
group5.add_option("--force-if-not-empty", action="store_true", help="Force delete of queue even if it's not empty")
- group5.add_option("--force-if-not-used", action="store_true", help="Force delete of queue even if it's currently used")
+ group5.add_option("--force-if-used", action="store_true", help="Force delete of queue even if it's currently used")
parser.add_option_group(group5)
group6 = OptionGroup(parser, "Options for Declaring Bindings")