From 2f3cfe19ca558dc26bf9cd1a9d81e3955e2edfcb Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 10 Mar 2004 13:29:14 +0000
Subject: * 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/fileutils.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index d34e6fec4..8b4ec9d80 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
-- 
cgit