1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
shyouhei 2010-04-19 10:46:48 +00:00
parent 04247ab5b4
commit 50fa45fb89
2 changed files with 6 additions and 0 deletions

View file

@ -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.

View file

@ -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