summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-13 15:32:22 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-13 15:32:22 +0000
commita1f41cafe82b6ce3074d29d809e2c5ba71e0c1e9 (patch)
tree231a2d67cd71a3da36c9ad8d0022218a08b4cd1f /lib
parent0224bb03855c830795b060525eb74843096e7b6d (diff)
merge revision(s) 50141: [Backport #11021]
* lib/fileutils.rb (FileUtils#mv): show the exact target path in the error message instead of the destination parent directory name. patched by Joao Britto <jabcalves AT gmail.com> at [ruby-core:68706]. [Bug #11021] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/fileutils.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 23fd19310a..932776c847 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -518,7 +518,7 @@ module FileUtils
begin
if destent.exist?
if destent.directory?
- raise Errno::EEXIST, dest
+ raise Errno::EEXIST, d
else
destent.remove_file if rename_cannot_overwrite_file?
end