diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/fileutils.rb | 1 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Jun 8 15:33:30 2010 URABE Shyouhei <shyouhei@ruby-lang.org> + + * lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are + destroyed otherwise. + Tue Jun 8 15:27:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (search_required): expand home relative path first. diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 3ef80ed601..d6b6cd2d7a 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 = 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] @@ -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 |