diff mbox series

[v3,16/33] podman: fix command invocation

Message ID 20190924210106.27117-17-alex.bennee@linaro.org
State Superseded
Headers show
Series testing/next (docker,tcg, alpha ;-) | expand

Commit Message

Alex Bennée Sept. 24, 2019, 9 p.m. UTC
From: John Snow <jsnow@redhat.com>


Oops; there's no argv here.

Signed-off-by: John Snow <jsnow@redhat.com>

Message-Id: <20190913193821.17756-1-jsnow@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

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

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

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

-- 
2.20.1

Comments

Thomas Huth Sept. 25, 2019, 12:36 p.m. UTC | #1
On 24/09/2019 23.00, Alex Bennée wrote:
> From: John Snow <jsnow@redhat.com>

> 

> Oops; there's no argv here.

> 

> Signed-off-by: John Snow <jsnow@redhat.com>

> Message-Id: <20190913193821.17756-1-jsnow@redhat.com>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

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

> Tested-by: Cleber Rosa <crosa@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 3112892fdf5..31d8adf836e 100755

> --- a/tests/docker/docker.py

> +++ b/tests/docker/docker.py

> @@ -332,7 +332,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,

> 


I ran into the same issue, too.

Reviewed-by: Thomas Huth <thuth@redhat.com>

Tested-by: Thomas Huth <thuth@redhat.com>
diff mbox series

Patch

diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 3112892fdf5..31d8adf836e 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -332,7 +332,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,