hsbt	2014-08-12 12:21:57 +0900 (Tue, 12 Aug 2014)

  New Revision: 47148

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47148

  Log:
    * lib/fileutils.rb: fix typo.
      [ruby-dev:47831] [Bug #9180]

  Modified files:
    trunk/ChangeLog
    trunk/lib/fileutils.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 47147)
+++ ChangeLog	(revision 47148)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Aug 12 12:14:52 2014  Akira Matsuda <ronnie@d...>
+
+	* lib/fileutils.rb: fix typo.
+	  [ruby-dev:47831] [Bug #9180]
+
 Tue Aug 12 10:10:42 2014  Eric Wong  <e@8...>
 
 	* vm_method.c (release_method_definition): use rb_free_method_entry
Index: lib/fileutils.rb
===================================================================
--- lib/fileutils.rb	(revision 47147)
+++ lib/fileutils.rb	(revision 47148)
@@ -1358,7 +1358,7 @@ module FileUtils https://github.com/ruby/ruby/blob/trunk/lib/fileutils.rb#L1358
       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 https://github.com/ruby/ruby/blob/trunk/lib/fileutils.rb#L1553
     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_

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