diff options
| author | Jinsong Liu <jinsong.liu@intel.com> | 2011-08-30 17:23:12 +0100 |
|---|---|---|
| committer | Jinsong Liu <jinsong.liu@intel.com> | 2011-08-30 17:23:12 +0100 |
| commit | 8bd8b94e5ccc6d549321ffa98360011a9fc514c0 (patch) | |
| tree | e63bf2586e6a5a2c831d219330bb4216f8527520 | |
| parent | 16d9581cf7f1c45974304ef93dd32bfff77c5ed4 (diff) | |
| download | xen-8bd8b94e5ccc6d549321ffa98360011a9fc514c0.tar.gz xen-8bd8b94e5ccc6d549321ffa98360011a9fc514c0.tar.bz2 xen-8bd8b94e5ccc6d549321ffa98360011a9fc514c0.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>
xen-unstable changeset: 23379:b04e57ec4671
Backport-requested-by: Shriram Rajagopalan <rshriram@gmail.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
| -rw-r--r-- | tools/python/xen/remus/save.py | 11 |
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() |