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

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1273481108 -3600
# Node ID fa75639b224aeb600b60e13ec699b643dd177475
# Parent  a95080796d19fc16320f8c771ba7ccaa1cc96d71
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>
xen-unstable changeset:   21265:71cf9b12ac9e
xen-unstable date:        Tue May 04 12:23:54 2010 +0100
---
 tools/python/xen/xend/XendOptions.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff -r a95080796d19 -r fa75639b224a tools/python/xen/xend/XendOptions.py
--- a/tools/python/xen/xend/XendOptions.py      Mon May 10 09:44:37 2010 +0100
+++ b/tools/python/xen/xend/XendOptions.py      Mon May 10 09:45:08 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