[Xen-changelog] [xen-unstable] xm: fix up exception handling when spawning vnc viewer.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1217844391 -3600
# Node ID 9109c9dfbc2e28440c300ed180710393639b8801
# Parent  0c857419d354804ec4cf1548c4fd06bc4e26047e
xm: fix up exception handling when spawning vnc viewer.

From: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/python/xen/xm/console.py |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff -r 0c857419d354 -r 9109c9dfbc2e tools/python/xen/xm/console.py
--- a/tools/python/xen/xm/console.py    Mon Aug 04 10:59:22 2008 +0100
+++ b/tools/python/xen/xm/console.py    Mon Aug 04 11:06:31 2008 +0100
@@ -40,14 +40,12 @@ class OurXenstoreConnection:
             while True:
                 result = self.handle.read('0', path)
                 if result is not None:
+                    signal.alarm(0)
                     return result
                 self.handle.read_watch()
-            self.handle.unwatch(path, watch)
-            signal.alarm(0)
-        except:
+        finally:
             signal.alarm(0)
             if watch is not None: self.handle.unwatch(path, watch)
-            raise
     def read_maybe(self, path):
         return self.handle.read('0', path)
 

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