synchronize: don't add ssh_args to ssh_opts when false or null

pull/18777/head
Ryan Hartkopf 10 years ago committed by Matt Clay
parent 2e9462aa21
commit 118382ca70

@ -316,7 +316,11 @@ def main():
else: else:
private_key = '-i '+ private_key private_key = '-i '+ private_key
ssh_opts = '-S none -o StrictHostKeyChecking=no %s' % ssh_args if ssh_args:
ssh_opts = '-S none -o StrictHostKeyChecking=no %s' % ssh_args
else:
ssh_opts = '-S none -o StrictHostKeyChecking=no'
if dest_port != 22: if dest_port != 22:
cmd += " --rsh 'ssh %s %s -o Port=%s'" % (private_key, ssh_opts, dest_port) cmd += " --rsh 'ssh %s %s -o Port=%s'" % (private_key, ssh_opts, dest_port)
else: else:

Loading…
Cancel
Save