From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 4 Aug 2008 10:06:31 +0000 (+0100)
Subject: xm: fix up exception handling when spawning vnc viewer.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14165^2~41
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f06e83208866f9e6cccee051704de153a6f97b3a;p=xen.git

xm: fix up exception handling when spawning vnc viewer.

From: Ian Jackson <Ian.Jackson@eu.citrix.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/tools/python/xen/xm/console.py b/tools/python/xen/xm/console.py
index 8abcb1d9a6..0b83f1139d 100644
--- a/tools/python/xen/xm/console.py
+++ b/tools/python/xen/xm/console.py
@@ -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)