diff options
| author | Justin Ross <jross@apache.org> | 2012-11-09 13:46:42 +0000 |
|---|---|---|
| committer | Justin Ross <jross@apache.org> | 2012-11-09 13:46:42 +0000 |
| commit | 7ec68252849613f79171cf2e42eaf3e308f01d36 (patch) | |
| tree | ab8e9c8e1bb64454a900fa998290e862d628ad2a | |
| parent | 58df256fdc65f9dcb81a2f32075ed0a981ff5345 (diff) | |
| download | qpid-python-7ec68252849613f79171cf2e42eaf3e308f01d36.tar.gz | |
Reverting change 1404836, which was causing test failures
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1407448 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | qpid/tools/src/py/qpid-config | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/qpid/tools/src/py/qpid-config b/qpid/tools/src/py/qpid-config index e46b311552..df43b7ea4e 100755 --- a/qpid/tools/src/py/qpid-config +++ b/qpid/tools/src/py/qpid-config @@ -18,8 +18,10 @@ # specific language governing permissions and limitations # under the License. # +import pdb + import os -from optparse import OptionParser, OptionGroup, IndentedHelpFormatter, SUPPRESS_HELP +from optparse import OptionParser, OptionGroup, IndentedHelpFormatter import sys import locale @@ -47,7 +49,7 @@ description = """ Examples: $ qpid-config add queue q -$ qpid-config add exchange direct d -b localhost:5672 +$ qpid-config add exchange direct d -a localhost:5672 $ qpid-config exchanges -b 10.1.1.7:10000 $ qpid-config queues -b guest/guest@broker-host:10000 @@ -173,7 +175,6 @@ def OptionsAndArguments(argv): 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("-r", "--recursive", action="store_true", help="Show bindings in queue or exchange list") group1.add_option("-b", "--broker", action="store", type="string", default="localhost:5672", metavar="<address>", help="Address of qpidd broker with syntax: [username/password@] hostname | ip-address [:<port>]") - group1.add_option("-a", "--broker-addr", action="store", type="string", default="localhost:5672", metavar="<address>", help=SUPPRESS_HELP) 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.") group1.add_option("--ssl-certificate", action="store", type="string", metavar="<cert>", help="Client SSL certificate (PEM Format)") group1.add_option("--ssl-key", action="store", type="string", metavar="<key>", help="Client SSL private key (PEM Format)") @@ -244,8 +245,6 @@ def OptionsAndArguments(argv): config._recursive = True if opts.broker: config._host = opts.broker - if opts.broker_addr: - config._host = opts.broker_addr if opts.timeout is not None: config._connTimeout = opts.timeout if config._connTimeout == 0: |