From 8bd8b94e5ccc6d549321ffa98360011a9fc514c0 Mon Sep 17 00:00:00 2001 From: Jinsong Liu Date: Tue, 30 Aug 2011 17:23:12 +0100 Subject: [PATCH] remus: write circumlocution for try..except..finally Parsing /otc/source/vtd/xen-unstable/tools/python/../../tools/libxl/libxl.idl File "/usr/lib64/python2.4/site-packages/xen/remus/save.py", line 169 finally: ^ SyntaxError: invalid syntax This was introduced in 23195:13ec53a59a42 It is a problem for Python 2.4 and earlier, only. So use try...(try...except)...finally as suggested by Ian Campbell. Signed-off-by: Liu, Jinsong Acked-by: Shriram Rajagopalan Acked-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson xen-unstable changeset: 23379:b04e57ec4671 Backport-requested-by: Shriram Rajagopalan Committed-by: Ian Jackson --- tools/python/xen/remus/save.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/python/xen/remus/save.py b/tools/python/xen/remus/save.py index 0c86eeb55f..3b04cd8db3 100644 --- a/tools/python/xen/remus/save.py +++ b/tools/python/xen/remus/save.py @@ -161,11 +161,12 @@ class Saver(object): self.checkpointer = xen.lowlevel.checkpoint.checkpointer() try: - self.checkpointer.open(self.vm.domid) - self.checkpointer.start(self.fd, self.suspendcb, self.resumecb, - self.checkpointcb, self.interval) - except xen.lowlevel.checkpoint.error, e: - raise CheckpointError(e) + try: + self.checkpointer.open(self.vm.domid) + self.checkpointer.start(self.fd, self.suspendcb, self.resumecb, + self.checkpointcb, self.interval) + except xen.lowlevel.checkpoint.error, e: + raise CheckpointError(e) finally: try: #errors in checkpoint close are not critical atm. self.checkpointer.close()