summaryrefslogtreecommitdiff
path: root/lorrycontroller
diff options
context:
space:
mode:
authorBen Hutchings <ben.hutchings@codethink.co.uk>2020-06-01 17:03:26 +0100
committerBen Hutchings <ben.hutchings@codethink.co.uk>2020-06-01 17:03:26 +0100
commit75c990bc607b1059a4ea89b323a7b2658b9c313a (patch)
treef97dbe25aa6f7bfad22de5588bda3f997d65cd48 /lorrycontroller
parent91f046b71e0ec46c957da3055a268ff8f0ba45c4 (diff)
parentc9d8b4c132667c9eba92ac696047892e6f65e4cf (diff)
downloadlorry-controller-75c990bc607b1059a4ea89b323a7b2658b9c313a.tar.gz
Merge branch 'bwh/gerrit-ssh-quoting' into bwh/remote-downstreams
Diffstat (limited to 'lorrycontroller')
-rw-r--r--lorrycontroller/gerrit.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lorrycontroller/gerrit.py b/lorrycontroller/gerrit.py
index dd82ff8..c18f2ed 100644
--- a/lorrycontroller/gerrit.py
+++ b/lorrycontroller/gerrit.py
@@ -42,7 +42,8 @@ class GerritDownstream(hosts.DownstreamHost):
'%s@%s' % (user, host)]
def _ssh_command(self, command):
- out = cliapp.runcmd(self._ssh_command_args + command)
+ quoted_args = [cliapp.shell_quote(x) for x in command]
+ out = cliapp.runcmd(self._ssh_command_args + quoted_args)
if isinstance(out, bytes):
out = out.decode('utf-8', errors='replace')
return out