python 2 compat
This commit is contained in:
@ -43,7 +43,7 @@ class CmdPipe:
|
|||||||
ret = ret + "(" + " ".join(item['cmd']) + ")"
|
ret = ret + "(" + " ".join(item['cmd']) + ")"
|
||||||
else:
|
else:
|
||||||
#make it copy-pastable, will make a mess of quotes sometimes, but is correct
|
#make it copy-pastable, will make a mess of quotes sometimes, but is correct
|
||||||
ret = ret + "(" + shlex.join(item['cmd']) + ")"
|
ret = ret + "(" + " ".join(map(shlex.quote,item['cmd'])) + ")"
|
||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
|||||||
@ -62,7 +62,7 @@ class ExecuteNode(LogStub):
|
|||||||
|
|
||||||
ret.append(self.ssh_to)
|
ret.append(self.ssh_to)
|
||||||
|
|
||||||
ret.append(shlex.join(cmd))
|
ret.append(" ".join(map(shlex.quote, cmd)))
|
||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user