diff options
| author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-10 13:29:14 +0000 |
|---|---|---|
| committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-10 13:29:14 +0000 |
| commit | 4c99df418063b02efbd2a6293bab0265eeb37f72 (patch) | |
| tree | ce4ff46921debda4d47c03fac44a938e7f505f7f | |
| parent | 692cc24339123fbd85ce1531b5895d661786132d (diff) | |
* lib/fileutils.rb (remove_dir): should handle symlink correctly. This patch is contributed by Christian Loew. [ruby-talk:94635] (Backport from main trunk)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/fileutils.rb | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Mar 10 22:28:09 2004 Minero Aoki <aamine@loveruby.net> + + * lib/fileutils.rb (remove_dir): should handle symlink correctly. + This patch is contributed by Christian Loew. [ruby-talk:94635] + (Backport from main trunk) + Wed Mar 10 16:28:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org> * eval.c (return_jump): set return value to the return diff --git a/lib/fileutils.rb b/lib/fileutils.rb index d34e6fec4b..8b4ec9d803 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -581,7 +581,9 @@ module FileUtils Dir.foreach(dir) do |file| next if /\A\.\.?\z/ === file path = "#{dir}/#{file}" - if File.directory?(path) + if File.symlink?(path) + remove_file path, force + elsif File.directory?(path) remove_dir path, force else remove_file path, force |