Skip to contentSkip to conversation

podman: fix command invocation

PATCH In review John Snow 3 participants 3 messages Sep 13, 2019 – Sep 23, 2019

lore
Share & tools
lore

John Snow

author
#0 lore raw

PATCH 1/1 podman: fix command invocation

Oops; there's no argv here.

---
 tests/docker/docker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/docker/docker.py +1 -1
index 29613afd48..bc7a470ca2 100755
@@ -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,
Signature · 1 line
2.21.0
#1 lore raw
Quoted 1 line · John Snow

Oops; there's no argv here.

Oops indeed. Queued to testing/next, thanks.

Quoted 11 lines
---
 tests/docker/docker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/docker/docker.py +0 -0
index 29613afd48..bc7a470ca2 100755

tests/docker/docker.py class Docker(object): · line 340

Quoted 8 lines
tests/docker/docker.py +1 -1
@@ -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

Reviewed-by Tested-by on v1 1/1
#2 lore raw
In reply to John Snow
Quoted 24 lines · John Snow

Oops; there's no argv here.

---
 tests/docker/docker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/docker/docker.py +1 -1
index 29613afd48..bc7a470ca2 100755
@@ -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,
Signature · 1 line
2.21.0

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