[前][次][番号順一覧][スレッド一覧]

ruby-changes:73010

From: David <ko1@a...>
Date: Mon, 22 Aug 2022 10:12:35 +0900 (JST)
Subject: [ruby-changes:73010] 70f69f8539 (master): [ruby/fileutils] Fix mkdir_p hanging on Windows when trying to create a file on a offline drive

https://git.ruby-lang.org/ruby.git/commit/?id=70f69f8539

From 70f69f85395f5735429cd45136d7de2742f08b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...>
Date: Mon, 1 Aug 2022 20:35:37 +0200
Subject: [ruby/fileutils] Fix mkdir_p hanging on Windows when trying to create
 a file on a offline drive

https://github.com/ruby/fileutils/commit/9cc6a082d7
---
 lib/fileutils.rb                 | 2 +-
 test/fileutils/test_fileutils.rb | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 7eb66dda0c..8ae5266864 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -374,7 +374,7 @@ module FileUtils https://github.com/ruby/ruby/blob/trunk/lib/fileutils.rb#L374
       path = remove_trailing_slash(item)
 
       stack = []
-      until File.directory?(path)
+      until File.directory?(path) || File.dirname(path) == path
         stack.push path
         path = File.dirname(path)
       end
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index e1e2a829c3..4afc8085ef 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -1098,6 +1098,14 @@ class TestFileUtils < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/fileutils/test_fileutils.rb#L1098
     ensure
       Dir.rmdir(drive) if drive and File.directory?(drive)
     end
+
+    def test_mkdir_p_offline_drive
+      offline_drive = ("A".."Z").to_a.reverse.find {|d| !File.exist?("#{d}:/") }
+
+      assert_raise(Errno::ENOENT) {
+        mkdir_p "#{offline_drive}:/new_dir"
+      }
+    end
   end
 
   def test_mkdir_p_file_perm
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]