зеркало из https://github.com/github/ruby.git
[ruby/fileutils] Fix #install with "X" mode option
`FileUtils#install` methed raises an unexpected `TypeError`, when called with `mode:` option which has `"X"`. ``` $ ruby -rfileutils -e 'FileUtils.install("tmp/a", "tmp/b", mode: "o+X")' /opt/local/lib/ruby/2.7.0/fileutils.rb:942:in `directory?': no implicit conversion of File::Stat into String (TypeError) from /opt/local/lib/ruby/2.7.0/fileutils.rb:942:in `block (3 levels) in symbolic_modes_to_i' from /opt/local/lib/ruby/2.7.0/fileutils.rb:933:in `each_char' from /opt/local/lib/ruby/2.7.0/fileutils.rb:933:in `each' from /opt/local/lib/ruby/2.7.0/fileutils.rb:933:in `inject' from /opt/local/lib/ruby/2.7.0/fileutils.rb:933:in `block (2 levels) in symbolic_modes_to_i' from /opt/local/lib/ruby/2.7.0/fileutils.rb:931:in `each' from /opt/local/lib/ruby/2.7.0/fileutils.rb:931:in `each_slice' from /opt/local/lib/ruby/2.7.0/fileutils.rb:931:in `block in symbolic_modes_to_i' from /opt/local/lib/ruby/2.7.0/fileutils.rb:926:in `each' from /opt/local/lib/ruby/2.7.0/fileutils.rb:926:in `inject' from /opt/local/lib/ruby/2.7.0/fileutils.rb:926:in `symbolic_modes_to_i' from /opt/local/lib/ruby/2.7.0/fileutils.rb:973:in `fu_mode' from /opt/local/lib/ruby/2.7.0/fileutils.rb:883:in `block in install' from /opt/local/lib/ruby/2.7.0/fileutils.rb:1588:in `block in fu_each_src_dest' from /opt/local/lib/ruby/2.7.0/fileutils.rb:1604:in `fu_each_src_dest0' from /opt/local/lib/ruby/2.7.0/fileutils.rb:1586:in `fu_each_src_dest' from /opt/local/lib/ruby/2.7.0/fileutils.rb:877:in `install' from -e:1:in `<main>' ``` In spite of that `symbolic_modes_to_i` considers the `File::Stat` `path` case at the beginning, in `"X"` case, `path` is passed to `FileTest.directory?` method which requires a `String`. In such case, the mode in `path` should be examined instead. https://github.com/ruby/fileutils/commit/2ea54ade2f
This commit is contained in:
Родитель
aab74fc938
Коммит
eab88d20ea
|
@ -917,11 +917,8 @@ module FileUtils
|
|||
private_module_function :apply_mask
|
||||
|
||||
def symbolic_modes_to_i(mode_sym, path) #:nodoc:
|
||||
mode = if File::Stat === path
|
||||
path.mode
|
||||
else
|
||||
File.stat(path).mode
|
||||
end
|
||||
path = File.stat(path) unless File::Stat === path
|
||||
mode = path.mode
|
||||
mode_sym.split(/,/).inject(mode & 07777) do |current_mode, clause|
|
||||
target, *actions = clause.split(/([=+-])/)
|
||||
raise ArgumentError, "invalid file mode: #{mode_sym}" if actions.empty?
|
||||
|
@ -938,7 +935,7 @@ module FileUtils
|
|||
when "x"
|
||||
mask | 0111
|
||||
when "X"
|
||||
if FileTest.directory? path
|
||||
if path.directory?
|
||||
mask | 0111
|
||||
else
|
||||
mask
|
||||
|
|
|
@ -1182,6 +1182,8 @@ class TestFileUtils < Test::Unit::TestCase
|
|||
assert_filemode 04500, 'tmp/j'
|
||||
install 'tmp/j', 'tmp/k', :mode => "+s"
|
||||
assert_filemode 06500, 'tmp/k'
|
||||
install 'tmp/a', 'tmp/l', :mode => "o+X"
|
||||
assert_filemode 0644, 'tmp/l'
|
||||
end if have_file_perm?
|
||||
|
||||
def test_chmod
|
||||
|
|
Загрузка…
Ссылка в новой задаче