sparrowhawk/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Default ssh mux options fixes.

Browse source
This commit is contained in:
Darko Poljak 2016-03-10 20:40:37 +01:00
parent 215e58eb38
commit b4ac23b4f8
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/cdist
View file

@ -22,6 +22,8 @@
# #
def inspect_ssh_mux_opts(): def inspect_ssh_mux_opts():
import subprocess
"""Inspect whether or not ssh supports multiplexing options""" """Inspect whether or not ssh supports multiplexing options"""
wanted_mux_opts = { wanted_mux_opts = {
"ControlPath":"~/.ssh/master-%l-%r@%h:%p", "ControlPath":"~/.ssh/master-%l-%r@%h:%p",
@ -38,13 +40,13 @@ def inspect_ssh_mux_opts():
for x in check: for x in check:
try: try:
subprocess.check_output("ssh -o {}".format(x), subprocess.check_output("ssh -o {}".format(x),
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT, shell=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
foo = e.output.decode().lower() foo = e.output.decode().lower()
if not "bad configuration option" in foo: if not "bad configuration option" in foo:
for o in check[x]: for o in check[x]:
mux_opts[o] = wanted_mux_opts[o] mux_opts[o] = wanted_mux_opts[o]
foo = ["-o {}={}".format(x, mux_opts[x]) for x in mux_opts] foo = [" -o {}={}".format(x, mux_opts[x]) for x in mux_opts]
return " ".join(foo) return " ".join(foo)
def commandline(): def commandline():