From 0210b487a4ed299d3aad570c8cec74303c2cb308 Mon Sep 17 00:00:00 2001 From: hsbt Date: Tue, 12 Aug 2014 03:21:57 +0000 Subject: * 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 --- ChangeLog | 5 +++++ lib/fileutils.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1334514734..6f62f68d4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 12 12:14:52 2014 Akira Matsuda + + * lib/fileutils.rb: fix typo. + [ruby-dev:47831] [Bug #9180] + Tue Aug 12 10:10:42 2014 Eric Wong * vm_method.c (release_method_definition): use rb_free_method_entry diff --git a/lib/fileutils.rb b/lib/fileutils.rb index d97f2d4667..d928e3b2d7 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -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_ -- cgit v1.2.3