podman: fix command invocation

[Qemu-devel] [PATCH] podman: fix command invocation

John Snow posted 1 patch 6 years, 1 month ago

Download mbox

Test docker-clang@ubuntu failed

Test FreeBSD passed

Test checkpatch passed

Test docker-quick@centos7 passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190913193821.17756-1-jsnow@redhat.com

Maintainers: Fam Zheng <fam@euphon.net>, "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@redhat.com>

tests/docker/docker.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] podman: fix command invocation

Posted by John Snow 6 years, 1 month ago

Oops; there's no argv here.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/docker/docker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 29613afd48..bc7a470ca2 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -334,7 +334,7 @@ class Docker(object):
             cmd = [ "-u", str(uid) ] + cmd
             # podman requires a bit more fiddling
             if self._command[0] == "podman":
-                argv.insert(0, '--userns=keep-id')
+                cmd.insert(0, '--userns=keep-id')
 
         ret = self._do_check(["run", "--label",
                              "com.qemu.instance.uuid=" + label] + cmd,
-- 
2.21.0

Re: [Qemu-devel] [PATCH] podman: fix command invocation

Posted by Alex Bennée 6 years, 1 month ago

John Snow <jsnow@redhat.com> writes:

> Oops; there's no argv here.

Oops indeed. Queued to testing/next, thanks.

>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/docker/docker.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/docker/docker.py b/tests/docker/docker.py
> index 29613afd48..bc7a470ca2 100755
> --- a/tests/docker/docker.py
> +++ b/tests/docker/docker.py
> @@ -334,7 +334,7 @@ class Docker(object):
>              cmd = [ "-u", str(uid) ] + cmd
>              # podman requires a bit more fiddling
>              if self._command[0] == "podman":
> -                argv.insert(0, '--userns=keep-id')
> +                cmd.insert(0, '--userns=keep-id')
>
>          ret = self._do_check(["run", "--label",
>                               "com.qemu.instance.uuid=" + label] + cmd,


--
Alex Bennée

Re: [Qemu-devel] [PATCH] podman: fix command invocation

Posted by Cleber Rosa 6 years, 1 month ago

On Fri, Sep 13, 2019 at 03:38:21PM -0400, John Snow wrote:
> Oops; there's no argv here.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/docker/docker.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/docker/docker.py b/tests/docker/docker.py
> index 29613afd48..bc7a470ca2 100755
> --- a/tests/docker/docker.py
> +++ b/tests/docker/docker.py
> @@ -334,7 +334,7 @@ class Docker(object):
>              cmd = [ "-u", str(uid) ] + cmd
>              # podman requires a bit more fiddling
>              if self._command[0] == "podman":
> -                argv.insert(0, '--userns=keep-id')
> +                cmd.insert(0, '--userns=keep-id')
>  
>          ret = self._do_check(["run", "--label",
>                               "com.qemu.instance.uuid=" + label] + cmd,
> -- 
> 2.21.0
> 
> 

Hit it Today while testing your test/docker Python 3 patches.

Reviewed-by: Cleber Rosa <crosa@redhat.com>
Tested-by: Cleber Rosa <crosa@redhat.com>