shyouhei	2010-04-19 19:46:48 +0900 (Mon, 19 Apr 2010)

  New Revision: 27400

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27400

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

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/fileutils.rb
    trunk/ChangeLog
    trunk/lib/fileutils.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27399)
+++ ChangeLog	(revision 27400)
@@ -1,3 +1,7 @@
+Mon Apr 19 19:41:10 2010  URABE Shyouhei  <shyouhei@r...>
+
+	* lib/fileutils.rb (FileUtils::cp_r): backport r11156 from ruby_1_8.
+
 Mon Apr 19 19:18:53 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (parser_yylex): reduced duplicated conditions.
Index: lib/fileutils.rb
===================================================================
--- lib/fileutils.rb	(revision 27399)
+++ lib/fileutils.rb	(revision 27400)
@@ -427,6 +427,8 @@
     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
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 27399)
+++ ruby_1_8/ChangeLog	(revision 27400)
@@ -1,3 +1,8 @@
+Mon Apr 19 19:42:08 2010  URABE Shyouhei  <shyouhei@r...>
+
+	* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are
+	  destroyed otherwise.
+
 Mon Apr 19 19:13:12 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (search_required): expand home relative path first.
Index: ruby_1_8/lib/fileutils.rb
===================================================================
--- ruby_1_8/lib/fileutils.rb	(revision 27399)
+++ ruby_1_8/lib/fileutils.rb	(revision 27400)
@@ -418,6 +418,7 @@
     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]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/