From ba70d002043619ecf6fc344822911a104b3e7215 Mon Sep 17 00:00:00 2001 From: aamine Date: Fri, 13 Oct 2006 13:34:09 +0000 Subject: * lib/fileutils.rb (FileUtils.cp_r): dereference_root=true is default in Ruby 1.8. This line is wrongly removed in last commit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/fileutils.rb | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 634582707c..33b7c716b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 13 22:33:28 2006 Minero Aoki + + * lib/fileutils.rb (FileUtils.cp_r): dereference_root=true is + default in Ruby 1.8. This line is wrongly removed in last commit. + Fri Oct 13 18:19:31 2006 Yukihiro Matsumoto * object.c: Class#inherited RDoc added. a patch from Daniel diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 902d925536..9aea507a19 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -418,6 +418,7 @@ module FileUtils fu_check_options options, OPT_TABLE['cp_r'] fu_output_message "cp -r#{options[:preserve] ? 'p' : ''}#{options[:remove_destination] ? ' --remove-destination' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose] return if options[:noop] + options[:dereference_root] = true unless options.key?(:dereference_root) fu_each_src_dest(src, dest) do |s, d| copy_entry s, d, options[:preserve], options[:dereference_root], options[:remove_destination] end -- cgit v1.2.3