shyouhei	2010-06-08 15:31:50 +0900 (Tue, 08 Jun 2010)

  New Revision: 28211

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

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

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/fileutils.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 28210)
+++ ruby_1_8_7/ChangeLog	(revision 28211)
@@ -1,3 +1,8 @@
+Tue Jun  8 15:33:30 2010  URABE Shyouhei  <shyouhei@r...>
+
+	* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are
+	  destroyed otherwise.
+
 Tue Jun  8 15:27:00 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (search_required): expand home relative path first.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 28210)
+++ ruby_1_8_7/version.h	(revision 28211)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-06-08"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100608
-#define RUBY_PATCHLEVEL 275
+#define RUBY_PATCHLEVEL 276
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/fileutils.rb
===================================================================
--- ruby_1_8_7/lib/fileutils.rb	(revision 28210)
+++ ruby_1_8_7/lib/fileutils.rb	(revision 28211)
@@ -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/