This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


[Xen-changelog] [xen-unstable] xm: fix up exception handling when spawni

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] xm: fix up exception handling when spawning vnc viewer.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Mon, 04 Aug 2008 15:10:11 -0700
Delivery-date: Mon, 04 Aug 2008 15:10:10 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@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.unwatch(path, watch)
-            signal.alarm(0)
-        except:
+        finally:
             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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] xm: fix up exception handling when spawning vnc viewer., Xen patchbot-unstable <=