aboutsummaryrefslogtreecommitdiffstats
path: root/tools/python
diff options
context:
space:
mode:
authorJinsong Liu <jinsong.liu@intel.com>2011-05-24 16:12:25 +0100
committerJinsong Liu <jinsong.liu@intel.com>2011-05-24 16:12:25 +0100
commit2cb4424e3ae4481e8c63f7de2a5ab8f7489f8ec8 (patch)
tree786ca2ec72ecec93fe684c77a118770b4fbeadd0 /tools/python
parent3b6eaa3e341771827a9eca6c3eb8ee72593a3f56 (diff)
downloadxen-2cb4424e3ae4481e8c63f7de2a5ab8f7489f8ec8.tar.gz
xen-2cb4424e3ae4481e8c63f7de2a5ab8f7489f8ec8.tar.bz2
xen-2cb4424e3ae4481e8c63f7de2a5ab8f7489f8ec8.zip
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 <jinsong.liu@intel.com> Acked-by: Shriram Rajagopalan <rshriram@cs.ubc.ca> Acked-by: Ian Campbell <Ian.Campbell@eu.citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/python')
-rw-r--r--tools/python/xen/remus/save.py11
1 files 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()