| Message ID | 20170918052524.4045-1-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qemu.py: Fix syntax error | expand |
On Mon, Sep 18, 2017 at 07:25:24AM +0200, Kevin Wolf wrote: > Python requires parentheses around multiline expression. This fixes the > breakage of all Python-based qemu-iotests cases that was introduced in > commit dab91d9aa0. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > > Eduardo, I think I'm going to include this patch in a block layer pull > request today, just to stop the CI spam I'm getting, so the CC is just > FYI. > > scripts/qemu.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Kevin Wolf <kwolf@redhat.com> writes: > Python requires parentheses around multiline expression. This fixes the > breakage of all Python-based qemu-iotests cases that was introduced in > commit dab91d9aa0. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> Heh, just sent an identical patch. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Tested-by: Alex Bennée <alex.bennee@linaro.org> > --- > > Eduardo, I think I'm going to include this patch in a block layer pull > request today, just to stop the CI spam I'm getting, so the CC is just > FYI. > > scripts/qemu.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/qemu.py b/scripts/qemu.py > index 8c67595ec8..5e02dd8e78 100644 > --- a/scripts/qemu.py > +++ b/scripts/qemu.py > @@ -193,8 +193,8 @@ class QEMUMachine(object): > qemulog = open(self._qemu_log_path, 'wb') > try: > self._pre_launch() > - self._qemu_full_args = self._wrapper + [self._binary] + > - self._base_args() + self._args > + self._qemu_full_args = (self._wrapper + [self._binary] + > + self._base_args() + self._args) > self._popen = subprocess.Popen(self._qemu_full_args, > stdin=devnull, > stdout=qemulog, -- Alex Bennée
On 18 September 2017 at 06:25, Kevin Wolf <kwolf@redhat.com> wrote: > Python requires parentheses around multiline expression. This fixes the > breakage of all Python-based qemu-iotests cases that was introduced in > commit dab91d9aa0. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > > Eduardo, I think I'm going to include this patch in a block layer pull > request today, just to stop the CI spam I'm getting, so the CC is just > FYI. Applied to master as a buildfix; thanks. -- PMM
On Mon, Sep 18, 2017 at 07:25:24AM +0200, Kevin Wolf wrote: > Python requires parentheses around multiline expression. This fixes the > breakage of all Python-based qemu-iotests cases that was introduced in > commit dab91d9aa0. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > > Eduardo, I think I'm going to include this patch in a block layer pull > request today, just to stop the CI spam I'm getting, so the CC is just > FYI. No problem, thanks for fixing it. I incorrectly assumed "make check" was covering that code path. Sorry for the mess. > > scripts/qemu.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/qemu.py b/scripts/qemu.py > index 8c67595ec8..5e02dd8e78 100644 > --- a/scripts/qemu.py > +++ b/scripts/qemu.py > @@ -193,8 +193,8 @@ class QEMUMachine(object): > qemulog = open(self._qemu_log_path, 'wb') > try: > self._pre_launch() > - self._qemu_full_args = self._wrapper + [self._binary] + > - self._base_args() + self._args > + self._qemu_full_args = (self._wrapper + [self._binary] + > + self._base_args() + self._args) > self._popen = subprocess.Popen(self._qemu_full_args, > stdin=devnull, > stdout=qemulog, > -- > 2.13.5 >
diff --git a/scripts/qemu.py b/scripts/qemu.py index 8c67595ec8..5e02dd8e78 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -193,8 +193,8 @@ class QEMUMachine(object): qemulog = open(self._qemu_log_path, 'wb') try: self._pre_launch() - self._qemu_full_args = self._wrapper + [self._binary] + - self._base_args() + self._args + self._qemu_full_args = (self._wrapper + [self._binary] + + self._base_args() + self._args) self._popen = subprocess.Popen(self._qemu_full_args, stdin=devnull, stdout=qemulog,
Python requires parentheses around multiline expression. This fixes the breakage of all Python-based qemu-iotests cases that was introduced in commit dab91d9aa0. Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- Eduardo, I think I'm going to include this patch in a block layer pull request today, just to stop the CI spam I'm getting, so the CC is just FYI. scripts/qemu.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)