From 3c10bf77218bf2eabb14734c5c222f4679fd034b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 3 Feb 2014 12:09:13 +0100
Subject: [PATCH] communicators/ssh: better error message

---
 plugins/communicators/ssh/communicator.rb | 4 +++-
 templates/locales/en.yml                  | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/communicators/ssh/communicator.rb b/plugins/communicators/ssh/communicator.rb
index b86081850..79fc39e63 100644
--- a/plugins/communicators/ssh/communicator.rb
+++ b/plugins/communicators/ssh/communicator.rb
@@ -163,7 +163,9 @@ module VagrantPlugins
 
         # Otherwise, it is a permission denied, so let's raise a proper
         # exception
-        raise Vagrant::Errors::SCPPermissionDenied, :path => to.to_s
+        raise Vagrant::Errors::SCPPermissionDenied,
+          from: from.to_s,
+          to: to.to_s
       end
 
       protected
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index e9569ab76..bf7ddca12 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -571,10 +571,12 @@ en:
         is properly installed on your system and available on the PATH.
       scp_permission_denied: |-
         Failed to upload a file to the guest VM via SCP due to a permissions
-        error. This is normally because the user running Vagrant doesn't have
-        read permission on the file. Please set proper permissions on the file:
+        error. This is normally because the SSH user doesn't have permission
+        to write to the destination location. Alternately, the user running
+        Vagrant on the host machine may not have permission to read the file.
 
-        %{path}
+        Source: %{from}
+        Dest: %{to}
       scp_unavailable: |-
         SSH server on the guest doesn't support SCP. Please install the necessary
         software to enable SCP on your guest operating system.