diff options
| author | Anthony Liguori | 2013-08-22 16:29:25 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-08-22 16:29:25 +0200 |
| commit | 5211333bf77d5199d5f27cd306b2798d90a4c8fc (patch) | |
| tree | b348e71e5874fc649f33420c52d0e9e60d4ca962 /scripts | |
| parent | Merge remote-tracking branch 'jliu/or32' into staging (diff) | |
| parent | scripts/qapi.py: Avoid syntax not supported by Python 2.4 (diff) | |
| download | qemu-5211333bf77d5199d5f27cd306b2798d90a4c8fc.tar.gz qemu-5211333bf77d5199d5f27cd306b2798d90a4c8fc.tar.xz qemu-5211333bf77d5199d5f27cd306b2798d90a4c8fc.zip | |
Merge remote-tracking branch 'luiz/queue/qmp' into staging
# By Laszlo Ersek (8) and others
# Via Luiz Capitulino
* luiz/queue/qmp:
scripts/qapi.py: Avoid syntax not supported by Python 2.4
monitor: print the invalid char in error message
OptsVisitor: introduce unit tests, with test cases for range flattening
add "test-int128" and "test-bitops" to .gitignore
OptsVisitor: don't try to flatten overlong integer ranges
OptsVisitor: opts_type_uint64(): recognize intervals when LM_IN_PROGRESS
OptsVisitor: rebase opts_type_uint64() to parse_uint_full()
OptsVisitor: opts_type_int(): recognize intervals when LM_IN_PROGRESS
OptsVisitor: introduce list modes for interval flattening
OptsVisitor: introduce basic list modes
Convert stderr message calling error_get_pretty() to error_report()
Message-id: 1377015041-6567-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qapi.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py index 0ebea945bb..1069310f8d 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) |