mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/fileutils.rb: fix typo.
[ruby-dev:47831] [Bug #9180] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
5ab146166e
commit
0210b487a4
2 changed files with 7 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
Tue Aug 12 12:14:52 2014 Akira Matsuda <ronnie@dio.jp>
|
||||
|
||||
* lib/fileutils.rb: fix typo.
|
||||
[ruby-dev:47831] [Bug #9180]
|
||||
|
||||
Tue Aug 12 10:10:42 2014 Eric Wong <e@80x24.org>
|
||||
|
||||
* vm_method.c (release_method_definition): use rb_free_method_entry
|
||||
|
|
|
@ -1358,7 +1358,7 @@ module FileUtils
|
|||
when file?
|
||||
copy_file dest
|
||||
when directory?
|
||||
if !File.exist?(dest) and descendant_diretory?(dest, path)
|
||||
if !File.exist?(dest) and descendant_directory?(dest, path)
|
||||
raise ArgumentError, "cannot copy directory %s to itself %s" % [path, dest]
|
||||
end
|
||||
begin
|
||||
|
@ -1553,7 +1553,7 @@ module FileUtils
|
|||
end
|
||||
SYSCASE = File::FNM_SYSCASE.nonzero? ? "-i" : ""
|
||||
|
||||
def descendant_diretory?(descendant, ascendant)
|
||||
def descendant_directory?(descendant, ascendant)
|
||||
/\A(?#{SYSCASE}:#{Regexp.quote(ascendant)})#{DIRECTORY_TERM}/ =~ File.dirname(descendant)
|
||||
end
|
||||
end # class Entry_
|
||||
|
|
Loading…
Add table
Reference in a new issue