diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-01 00:59:14 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-01 00:59:14 +0000 |
| commit | 676fe089bde36dcae76b9fe2a6c1848251228837 (patch) | |
| tree | fe60a6795fb74acaf268a4f423bc74530af5f6c6 | |
| parent | c6411c645544fb9bc645c1d1970625fa486ed01c (diff) | |
fileutils.rb: fix error message
* lib/fileutils.rb (FileUtils#mv): show the exact target path in
the error message instead of the destination parent directory
name. patched by João Britto <jabcalves AT gmail.com> at
[ruby-core:68706]. [Bug #11021]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/fileutils.rb | 2 | ||||
| -rw-r--r-- | test/fileutils/test_fileutils.rb | 3 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Wed Apr 1 09:59:12 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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] + Tue Mar 31 15:25:07 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> * doc/ChangeLog-0.06_to_0.52: added archived Changelog. 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 diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb index fe9a1b327d..295fbfd960 100644 --- a/test/fileutils/test_fileutils.rb +++ b/test/fileutils/test_fileutils.rb @@ -416,7 +416,8 @@ class TestFileUtils < Test::Unit::TestCase mkdir 'tmp/tmpdir' mkdir_p 'tmp/dest2/tmpdir' - assert_raise(Errno::EEXIST) { + assert_raise_with_message(Errno::EEXIST, %r' - tmp/dest2/tmpdir\z', + '[ruby-core:68706] [Bug #11021]') { mv 'tmp/tmpdir', 'tmp/dest2' } mkdir 'tmp/dest2/tmpdir/junk' |