lib/rye/box.rb in rye-0.7.3 vs lib/rye/box.rb in rye-0.7.4

- old
+ new

@@ -203,11 +203,11 @@ # and not open an SSH session. # def interactive_ssh(run=true) debug "interactive_ssh with keys: #{Rye.keys.inspect}" run = false unless STDIN.tty? - cmd = Rye.prepare_command("ssh", "#{@rye_opts[:user]}@rye_#{@rye_host}") + cmd = Rye.prepare_command("ssh", "#{@rye_opts[:user]}@#{@rye_host}") return cmd unless run system(cmd) end # Add one or more private keys to the SSH Agent. @@ -529,10 +529,9 @@ begin @rye_ssh = Net::SSH.start(@rye_host, @rye_opts[:user], @rye_opts || {}) rescue Net::SSH::HostKeyMismatch => ex STDERR.puts ex.message - STDERR.puts "NOTE: EC2 instances generate new SSH keys on first boot." print "\a" if @rye_info # Ring the bell if highline.ask("Continue? ").strip.match(/\Ay|yes|sure|ya\z/i) @rye_opts[:paranoid] = false retry else