xend: fix bug in option parsing

If you enable legacy tcp xmlrpc in xend's config but omit to enable
ssl then a backtrace is generated when starting xend.

Signed-off-by: Arnd Hannemann <hannemann@nets.rwth-aachen.de>
xen-unstable changeset:   21265:71cf9b12ac9e
xen-unstable date:        Tue May 04 12:23:54 2010 +0100
This commit is contained in:
Keir Fraser committed 2010-05-10 09:45:08 +01:00
1 parent d8c2c71f17
commit d7be97a877
1 file changed
+4 -4
+4 -4
View File
@@ -207,18 +207,18 @@ class XendOptions:
def get_xend_tcp_xmlrpc_server_ssl_key_file(self):
name = 'xend-tcp-xmlrpc-server-ssl-key-file'
file = self.get_config_string(name)
if os.path.dirname(file) == "":
if file and os.path.dirname(file) == "":
file = auxbin.xen_configdir() + '/' + file;
if not os.path.exists(file):
if file and not os.path.exists(file):
raise XendError("invalid xend config %s: directory '%s' does not exist" % (name, file))
return file
def get_xend_tcp_xmlrpc_server_ssl_cert_file(self):
name = 'xend-tcp-xmlrpc-server-ssl-cert-file'
file = self.get_config_string(name)
if os.path.dirname(file) == "":
if file and os.path.dirname(file) == "":
file = auxbin.xen_configdir() + '/' + file;
if not os.path.exists(file):
if file and not os.path.exists(file):
raise XendError("invalid xend config %s: directory '%s' does not exist" % (name, file))
return file
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.