lib/chef/knife/ssh.rb in chef-10.14.0.rc.1 vs lib/chef/knife/ssh.rb in chef-10.14.0.rc.2
- old
+ new
@@ -189,11 +189,11 @@
def ssh_command(command, subsession=nil)
exit_status = 0
subsession ||= session
command = fixup_sudo(command)
- command.force_encoding('binary')
+ command.force_encoding('binary') if command.respond_to?(:force_encoding)
subsession.open_channel do |ch|
ch.request_pty
ch.exec command do |ch, success|
raise ArgumentError, "Cannot execute #{command}" unless success
ch.on_data do |ichannel, data|
@@ -380,11 +380,11 @@
config[:ssh_user] = get_stripped_unfrozen_value(config[:ssh_user] ||
Chef::Config[:knife][:ssh_user])
end
def configure_identity_file
- config[:identity_file] = get_stripped_unfrozen_value(config[:identity_file] ||
+ config[:identity_file] = get_stripped_unfrozen_value(config[:identity_file] ||
Chef::Config[:knife][:ssh_identity_file])
end
def run
extend Chef::Mixin::Command
@@ -421,6 +421,5 @@
end
end
end
end
-