diff options
author | elijah <elijah@riseup.net> | 2013-06-11 12:24:42 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2013-06-11 12:24:42 -0700 |
commit | f0c9d0a1fe8b19edf53f775dffb66057c0c9be12 (patch) | |
tree | cc7150c5b3c2e467f9b37e6b2e282160320c51d2 /vendor/rsync_command | |
parent | 404353dcf345122c0f04555a572efc5417f1b661 (diff) | |
download | leap_cli-f0c9d0a1fe8b19edf53f775dffb66057c0c9be12.tar.gz leap_cli-f0c9d0a1fe8b19edf53f775dffb66057c0c9be12.tar.bz2 |
fix longstanding problem with vagrant nodes: everyone has a different ssh pub key, but before leap_cli wanted you to commit these different keys into. Now, for vagrant nodes, we ignore the host key: we don't save it, we don't check it.
Diffstat (limited to 'vendor/rsync_command')
-rw-r--r-- | vendor/rsync_command/lib/rsync_command/ssh_options.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/rsync_command/lib/rsync_command/ssh_options.rb b/vendor/rsync_command/lib/rsync_command/ssh_options.rb index 494ec9d..3cc908f 100644 --- a/vendor/rsync_command/lib/rsync_command/ssh_options.rb +++ b/vendor/rsync_command/lib/rsync_command/ssh_options.rb @@ -32,14 +32,14 @@ class RsyncCommand def parse_options(options) options.map do |key, value| - next unless value + next if value.nil? # Convert Net::SSH options into OpenSSH options. case key when :auth_methods then opt_auth_methods(value) when :bind_address then opt('BindAddress', value) when :compression then opt('Compression', value ? 'yes' : 'no') when :compression_level then opt('CompressionLevel', value.to_i) - when :config then "-F '#{value}'" + when :config then value ? "-F '#{value}'" : nil when :encryption then opt('Ciphers', [value].flatten.join(',')) when :forward_agent then opt('ForwardAgent', value) when :global_known_hosts_file then opt('GlobalKnownHostsFile', value) |