diff options
| author | Jonathan Robie <jonathan@apache.org> | 2011-04-15 17:58:35 +0000 |
|---|---|---|
| committer | Jonathan Robie <jonathan@apache.org> | 2011-04-15 17:58:35 +0000 |
| commit | 8f1c852464651469d4a71c2cd7f0d64863f99974 (patch) | |
| tree | 9dfabde25da4550ebb6747e5d5833573a3bacbee | |
| parent | d030d0183fa6caef63c9098145f7239acbbc48b7 (diff) | |
| download | qpid-python-8f1c852464651469d4a71c2cd7f0d64863f99974.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@1092780 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | qpid/tools/src/py/qpid-config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/tools/src/py/qpid-config b/qpid/tools/src/py/qpid-config index 1c66d535b2..90c7ed10aa 100755 --- a/qpid/tools/src/py/qpid-config +++ b/qpid/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") |