From 616b8a3ca9ca3ef1907777131f5ce11bd6177d7b Mon Sep 17 00:00:00 2001 From: aamine Date: Mon, 1 Dec 2003 05:18:46 +0000 Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@5071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/fileutils.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/fileutils.rb b/lib/fileutils.rb index ee62f5838..e71ac864d 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 -- cgit