diff options
| author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-13 13:34:09 +0000 |
|---|---|---|
| committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-13 13:34:09 +0000 |
| commit | ba70d002043619ecf6fc344822911a104b3e7215 (patch) | |
| tree | 0d34d23adbb139802407a2548c9df6396b11cdeb | |
| parent | 01137aa51a2b7dff299ea6e9625bcb1dcafcb02c (diff) | |
* lib/fileutils.rb (FileUtils.cp_r): dereference_root=true is default in Ruby 1.8. This line is wrongly removed in last commit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/fileutils.rb | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Fri Oct 13 22:33:28 2006 Minero Aoki <aamine@loveruby.net> + + * lib/fileutils.rb (FileUtils.cp_r): dereference_root=true is + default in Ruby 1.8. This line is wrongly removed in last commit. + Fri Oct 13 18:19:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * object.c: Class#inherited RDoc added. a patch from Daniel diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 902d925536..9aea507a19 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[: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 |