From: mjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
Date: Fri, 11 Mar 2005 12:56:17 +0000 (+0000)
Subject: bitkeeper revision 1.1159.265.3 (42319571gIMQdofIDztktCfg053n-A)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17400^2~111^2~7^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ddc8c34b8fd4e78e813a9164611aff495335f1ab;p=xen.git

bitkeeper revision 1.1159.265.3 (42319571gIMQdofIDztktCfg053n-A)

Fix some errors in default error handling.

Signed-off-by: Mike Wray <mike.wray@hp.com>
---

diff --git a/tools/python/xen/xend/Args.py b/tools/python/xen/xend/Args.py
index 3e16844f74..480aa7ac21 100644
--- a/tools/python/xen/xend/Args.py
+++ b/tools/python/xen/xend/Args.py
@@ -78,6 +78,8 @@ class Args:
                 val = str(v)
             elif type == 'sxpr':
                 val = self.sxpr(v)
+            elif type == 'bool':
+                val = self.bool(v)
             else:
                 raise ArgError('invalid type:' + str(type))
             return val
@@ -86,6 +88,9 @@ class Args:
         except StandardError, ex:
             raise ArgError(str(ex))
 
+    def bool(self, v):
+        return (v.lower() in ['on', 'yes', '1', 'true'])
+
     def sxpr(self, v):
         if isinstance(v, types.ListType):
             val = v
diff --git a/tools/python/xen/xend/server/SrvBase.py b/tools/python/xen/xend/server/SrvBase.py
index b32d102273..5990733d75 100644
--- a/tools/python/xen/xend/server/SrvBase.py
+++ b/tools/python/xen/xend/server/SrvBase.py
@@ -106,7 +106,8 @@ class SrvBase(resource.Resource):
         try:
             val = op_method(op, req)
         except Exception, err:
-            return self._perform_err(err, op, req)
+            self._perform_err(err, op, req)
+            return ''
             
         if isinstance(val, defer.Deferred):
             val.addCallback(self._perform_cb, op, req, dfr=1)
diff --git a/tools/python/xen/xend/server/SrvDir.py b/tools/python/xen/xend/server/SrvDir.py
index 106c5ef268..712521c7b3 100644
--- a/tools/python/xen/xend/server/SrvDir.py
+++ b/tools/python/xen/xend/server/SrvDir.py
@@ -88,7 +88,7 @@ class SrvDir(SrvBase):
                 req.write('</body></html>')
             return ''
         except Exception, ex:
-            self._perform_err(ex, req)
+            self._perform_err(ex, "GET", req)
             
     def ls(self, req, use_sxp=0):
         url = req.prePathURL()