diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2010-05-10 09:45:08 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2010-05-10 09:45:08 +0100 |
commit | d7be97a877914dc25a1df6d8a231a0e2d575d786 (patch) | |
tree | 86ded9020ace8d197343506fb39b751bbdbabed4 | |
parent | d8c2c71f17ea754ac5204322614903ffef8681f0 (diff) | |
download | xen-d7be97a877914dc25a1df6d8a231a0e2d575d786.tar.gz xen-d7be97a877914dc25a1df6d8a231a0e2d575d786.tar.bz2 xen-d7be97a877914dc25a1df6d8a231a0e2d575d786.zip |
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
-rw-r--r-- | tools/python/xen/xend/XendOptions.py | 8 |
1 files 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 |