mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
fileutils.rb: do not make root
* lib/fileutils.rb (FileUtils#mkdir_p): no need to make root directory which should be exist and cannot be made with mkdir recent Cygwin can make a directory contains a colon. [Bug #13214] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a17384301b
commit
3261cfd881
2 changed files with 19 additions and 0 deletions
|
@ -201,6 +201,7 @@ module FileUtils
|
|||
stack.push path
|
||||
path = File.dirname(path)
|
||||
end
|
||||
stack.pop # root directory should exist
|
||||
stack.reverse_each do |dir|
|
||||
begin
|
||||
fu_mkdir dir, mode
|
||||
|
|
|
@ -905,6 +905,24 @@ class TestFileUtils < Test::Unit::TestCase
|
|||
mkdir_p '/'
|
||||
end
|
||||
|
||||
if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
|
||||
def test_mkdir_p_root
|
||||
if /cygwin/ =~ RUBY_PLATFORM
|
||||
tmpdir = `cygpath -ma .`.chomp
|
||||
else
|
||||
tmpdir = Dir.pwd
|
||||
end
|
||||
skip "No drive letter" unless /\A[a-z]:/i =~ tmpdir
|
||||
drive = "./#{$&}"
|
||||
assert_file_not_exist drive
|
||||
mkdir_p "#{tmpdir}/none/dir"
|
||||
assert_directory "none/dir"
|
||||
assert_file_not_exist drive
|
||||
ensure
|
||||
Dir.rmdir(drive) if drive and File.directory?(drive)
|
||||
end
|
||||
end
|
||||
|
||||
def test_mkdir_p_file_perm
|
||||
mkdir_p 'tmp/tmp/tmp', :mode => 07777
|
||||
assert_directory 'tmp/tmp/tmp'
|
||||
|
|
Loading…
Reference in a new issue