diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-08 06:31:50 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-08 06:31:50 +0000 |
| commit | 9252cb7d33682802f44fbe3a3a45356182557a1b (patch) | |
| tree | 3ac105c697e75ddeccf03d1530a04a2227bfdb33 /lib | |
| parent | 6e37bdc69f2d910432d20d5e29b8c8268aa06eb4 (diff) | |
merge revision(s) 27400:
* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are
destroyed otherwise.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fileutils.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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] |