diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/fileutils.rb | 2 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Mon Apr 19 19:41:10 2010 URABE Shyouhei <shyouhei@ruby-lang.org> + + * lib/fileutils.rb (FileUtils::cp_r): backport r11156 from ruby_1_8. + Mon Apr 19 19:18:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (parser_yylex): reduced duplicated conditions. diff --git a/lib/fileutils.rb b/lib/fileutils.rb index cfca8b91ec..c65f007b8a 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -427,6 +427,8 @@ 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 = options.dup + 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 |