Failed SSH commands show output in error message. [closes GH-285]

CHANGELOG.md

@@ -8,6 +8,7 @@
   - Change sudo shell to use `bash` (configurable). [GH-301]
   - Can now set mac address of host only network. [GH-294]
   - NFS shared folders with spaces now work properly. [GH-293]
+  - Failed SSH commands now show output in error message. [GH-285]
 
 ## 0.7.1 (January 28, 2011)
 

lib/vagrant/ssh/session.rb

@@ -75,7 +75,7 @@ module Vagrant
         options = { :error_check => true }.merge(options || {})
 
         block ||= Proc.new do |ch, type, data|
-          check_exit_status(data, command, options) if type == :exit_status && options[:error_check]
+          check_exit_status(data, command, options, ch[:result]) if type == :exit_status && options[:error_check]
 
           ch[:result] ||= ""
           ch[:result] << data if [:stdout, :stderr].include?(type)
@@ -99,12 +99,14 @@ module Vagrant
 
       # Checks for an erroroneous exit status and raises an exception
       # if so.
-      def check_exit_status(exit_status, commands, options=nil)
+      def check_exit_status(exit_status, commands, options=nil, output=nil)
         if exit_status != 0
+          output ||= '[no output]'
           options = {
             :_error_class => Errors::VagrantError,
             :_key => :ssh_bad_exit_status,
-            :command => [commands].flatten.join("\n")
+            :command => [commands].flatten.join("\n"),
+            :output => output
           }.merge(options || {})
 
           raise options[:_error_class], options

templates/locales/en.yml

@@ -70,6 +70,10 @@ en:
         Vagrant assumes that this means the command failed!
 
         %{command}
+
+        The output of the command prior to failing is outputted below:
+
+        %{output}
       ssh_connection_refused: |-
         SSH connection was refused! This usually happens if the VM failed to
         boot properly. Some steps to try to fix this: First, try reloading your