From 844e6ca68a313c4ef4e4daa75ac52a28b98b72f8 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 7 Jun 2010 12:30:25 +0000 Subject: [PATCH] ignore --xmlrpcs options if ssl is unavailable instead of hiding them and choking on them bzr revid: al@openerp.com-20100607123025-fbon3y7xhlvf4a89 --- bin/tools/config.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/bin/tools/config.py b/bin/tools/config.py index 5e16243b54a..c39fc5a7dca 100644 --- a/bin/tools/config.py +++ b/bin/tools/config.py @@ -108,14 +108,17 @@ class configmanager(object): group.add_option("--no-xmlrpc", dest="xmlrpc", action="store_false", help="disable the XML-RPC protocol") parser.add_option_group(group) - if self.has_ssl: - group = optparse.OptionGroup(parser, "XML-RPC Secure Configuration") - group.add_option("--xmlrpcs-interface", dest="xmlrpcs_interface", help="specify the TCP IP address for the XML-RPC Secure protocol") - group.add_option("--xmlrpcs-port", dest="xmlrpcs_port", help="specify the TCP port for the XML-RPC Secure protocol", type="int") - group.add_option("--no-xmlrpcs", dest="xmlrpcs", action="store_false", help="disable the XML-RPC Secure protocol") - group.add_option("--cert-file", dest="secure_cert_file", default="server.cert", help="specify the certificate file for the SSL connection") - group.add_option("--pkey-file", dest="secure_pkey_file", default="server.pkey", help="specify the private key file for the SSL connection") - parser.add_option_group(group) + title = "XML-RPC Secure Configuration" + if not self.has_ssl: + title += " (disabled as ssl is unavailable)" + + group = optparse.OptionGroup(parser, title) + group.add_option("--xmlrpcs-interface", dest="xmlrpcs_interface", help="specify the TCP IP address for the XML-RPC Secure protocol") + group.add_option("--xmlrpcs-port", dest="xmlrpcs_port", help="specify the TCP port for the XML-RPC Secure protocol", type="int") + group.add_option("--no-xmlrpcs", dest="xmlrpcs", action="store_false", help="disable the XML-RPC Secure protocol") + group.add_option("--cert-file", dest="secure_cert_file", default="server.cert", help="specify the certificate file for the SSL connection") + group.add_option("--pkey-file", dest="secure_pkey_file", default="server.pkey", help="specify the private key file for the SSL connection") + parser.add_option_group(group) group = optparse.OptionGroup(parser, "NET-RPC Configuration") group.add_option("--netrpc-interface", dest="netrpc_interface", help="specify the TCP IP address for the NETRPC protocol")