2983660f65
CVE-2013-4377: Fix crash when unplugging virtio devices (bz #1012633, bz #1012641) Fix 'new snapshot' slowness after the first snap (bz #988436) Fix 9pfs xattrs on kernel 3.11 (bz #1013676) CVE-2013-4344: buffer overflow in scsi_target_emulate_report_luns (bz #1015274, bz #1007330)
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From d6dcfd69f8b2aa2cad79486bbadef7d51f7f4e7d Mon Sep 17 00:00:00 2001
|
|
From: Peter Maydell <peter.maydell@linaro.org>
|
|
Date: Tue, 20 Aug 2013 15:50:15 +0100
|
|
Subject: [PATCH] scripts/qapi.py: Avoid syntax not supported by Python 2.4
|
|
|
|
The Python "except Foo as x" syntax was only introduced in
|
|
Python 2.6, but we aim to support Python 2.4 and later.
|
|
Use the old-style "except Foo, x" syntax instead, thus
|
|
fixing configure/compile on systems with older Python.
|
|
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
(cherry picked from commit 21e0043bada1a24ae2ba6cd0051e104c0cbf9634)
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
scripts/qapi.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/scripts/qapi.py b/scripts/qapi.py
|
|
index 0ebea94..1069310 100644
|
|
--- a/scripts/qapi.py
|
|
+++ b/scripts/qapi.py
|
|
@@ -161,7 +161,7 @@ class QAPISchema:
|
|
def parse_schema(fp):
|
|
try:
|
|
schema = QAPISchema(fp)
|
|
- except QAPISchemaError as e:
|
|
+ except QAPISchemaError, e:
|
|
print >>sys.stderr, e
|
|
exit(1)
|
|
|