diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-08-04 11:06:31 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-08-04 11:06:31 +0100 |
| commit | f06e83208866f9e6cccee051704de153a6f97b3a (patch) | |
| tree | a2929201eb700b3e0cc6ac0266e5ecc0e77dc6f1 | |
| parent | e7c388db06f0e8d040b35a67fa1dc06ab937e939 (diff) | |
| download | xen-f06e83208866f9e6cccee051704de153a6f97b3a.tar.gz xen-f06e83208866f9e6cccee051704de153a6f97b3a.tar.bz2 xen-f06e83208866f9e6cccee051704de153a6f97b3a.zip | |
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>
| -rw-r--r-- | tools/python/xen/xm/console.py | 6 |
1 files changed, 2 insertions, 4 deletions
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) |