summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-11 11:08:16 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-11 11:08:16 +0000
commit50e61c533bbf4b62c0144bfcd13f627c8fe9e95e (patch)
tree3eb83a8357f10070a2cd51b40c1c896b27ecb39f
parent5c3abcd043dca3794d68757a34640cb0ea9502b1 (diff)
* lib/ftools.rb (makedirs): sync with fileutils.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/ftools.rb6
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 38c1d8d4d2..ab8eb5f209 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 11 20:07:01 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * lib/ftools.rb (makedirs): sync with fileutils.
+
Thu Dec 11 19:53:03 2003 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (mkdir_p): catch all SystemCallErrors.
diff --git a/lib/ftools.rb b/lib/ftools.rb
index c605bc085e..0c6182b58b 100644
--- a/lib/ftools.rb
+++ b/lib/ftools.rb
@@ -136,7 +136,11 @@ class << File
makedirs parent unless FileTest.directory? parent
$deferr.print "mkdir ", dir, "\n" if verbose
if basename(dir) != ""
- Dir.mkdir dir, mode
+ begin
+ Dir.mkdir dir, mode
+ rescue SystemCallError
+ raise unless File.directory? dir
+ end
end
end
end