diff options
author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-01 05:18:46 +0000 |
---|---|---|
committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-01 05:18:46 +0000 |
commit | e5690fcd6dd932b3cf28ebc42f6b42498e161e97 (patch) | |
tree | 2c0598ed28b3fc4c6fa690c4a8a98652e7489ed0 /lib/fileutils.rb | |
parent | d8d81b35a43655a9009b1e7a11e22d28ef3ead2d (diff) | |
download | ruby-e5690fcd6dd932b3cf28ebc42f6b42498e161e97.tar.gz |
* lib/fileutils.rb (fu_each_src_dest0): call #to_str to allow Pathname for arguments. [ruby-core:01795]
* test/fileutils/test_fileutils.rb: does much strict test on "same" files detecting.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/fileutils.rb')
-rw-r--r-- | lib/fileutils.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb index ee62f5838b..e71ac864d4 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -719,12 +719,12 @@ module FileUtils def fu_each_src_dest0( src, dest ) unless src.is_a?(Array) - yield src, fu_dest_filename(src, dest) + yield src.to_str, fu_dest_filename(src.to_str, dest.to_str) else - dir = dest + dir = dest.to_str #raise ArgumentError, "not a directory: #{dir}" unless File.directory?(dir) dir += (dir[-1,1] == '/') ? '' : '/' - src.each do |fname| + src.map {|s| s.to_str }.each do |fname| yield fname, dir + File.basename(fname) end end |