From d7be97a877914dc25a1df6d8a231a0e2d575d786 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 10 May 2010 09:45:08 +0100 Subject: [PATCH] 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 xen-unstable changeset: 21265:71cf9b12ac9e xen-unstable date: Tue May 04 12:23:54 2010 +0100 --- tools/python/xen/xend/XendOptions.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/xend/XendOptions.py b/tools/python/xen/xend/XendOptions.py index 13145a111e..9abe9b1c2a 100644 --- a/tools/python/xen/xend/XendOptions.py +++ b/tools/python/xen/xend/XendOptions.py @@ -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