[Xen-changelog] [xen-unstable] xend: fix bug in option parsing

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1272972234 -3600
# Node ID 71cf9b12ac9effe2b7cf0aec058f92ee36430e0a
# Parent  a8eb546e3cb07e0f2477dea92affa14821a04108
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@xxxxxxxxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendOptions.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff -r a8eb546e3cb0 -r 71cf9b12ac9e tools/python/xen/xend/XendOptions.py
--- a/tools/python/xen/xend/XendOptions.py      Tue May 04 12:22:25 2010 +0100
+++ b/tools/python/xen/xend/XendOptions.py      Tue May 04 12:23:54 2010 +0100
@@ -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
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog