diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-08-28 14:51:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-08-28 14:51:12 +0100 |
| commit | 795c050e379ab21b75fc2bbb30699fe8752be157 (patch) | |
| tree | 65b4458823e43394ccf17ab89e6152d649819706 /scripts | |
| parent | 0265361a722f396cbdb35ecffbadb93142a6e87d (diff) | |
| parent | 00c6d403a3ac303ebdcb1706ee983e13ba8e2d5f (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/fix-buildbot-12082014-pull-request' into staging
Pull request
# gpg: Signature made Thu 28 Aug 2014 13:43:00 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/fix-buildbot-12082014-pull-request:
Revert "qemu-img: sort block formats in help message"
block: sort formats alphabetically in bdrv_iterate_format()
mirror: fix uninitialized variable delay_ns warnings
trace: avoid Python 2.5 all() in tracetool
libqtest: launch QEMU with QEMU_AUDIO_DRV=none
qapi.py: avoid Python 2.5+ any() function
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qapi.py | 8 | ||||
| -rw-r--r-- | scripts/tracetool/backend/__init__.py | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py index f2c6d1f840..77d46aa995 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -107,10 +107,10 @@ class QAPISchema: 'Expected a file name (string), got: %s' % include) include_path = os.path.join(self.input_dir, include) - if any(include_path == elem[1] - for elem in self.include_hist): - raise QAPIExprError(expr_info, "Inclusion loop for %s" - % include) + for elem in self.include_hist: + if include_path == elem[1]: + raise QAPIExprError(expr_info, "Inclusion loop for %s" + % include) # skip multiple include of the same file if include_path in previously_included: continue diff --git a/scripts/tracetool/backend/__init__.py b/scripts/tracetool/backend/__init__.py index 5bfa1efc5c..d4b6dab9ca 100644 --- a/scripts/tracetool/backend/__init__.py +++ b/scripts/tracetool/backend/__init__.py @@ -102,7 +102,8 @@ class Wrapper: def __init__(self, backends, format): self._backends = [backend.replace("-", "_") for backend in backends] self._format = format.replace("-", "_") - assert all(exists(backend) for backend in self._backends) + for backend in self._backends: + assert exists(backend) assert tracetool.format.exists(self._format) def _run_function(self, name, *args, **kwargs): |