* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are

	  destroyed otherwise.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,7 @@
+Mon Apr 19 19:41:10 2010  URABE Shyouhei  <[email protected]>
+
+	* lib/fileutils.rb (FileUtils::cp_r): backport r11156 from ruby_1_8.
+
 Mon Apr 19 19:18:53 2010  Nobuyoshi Nakada  <[email protected]>
 
 	* parse.y (parser_yylex): reduced duplicated conditions.

lib/fileutils.rb

@@ -427,6 +427,8 @@ def cp_r(src, dest, options = {})
     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