wyhaines	2010-05-25 02:25:00 +0900 (Tue, 25 May 2010)

  New Revision: 28001

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

  Log:
    Backport #1700 [ruby-core:24078]; Stringify group argument in #fu_get_gid before making regexp match.

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/lib/fileutils.rb

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 28000)
+++ ruby_1_8_6/ChangeLog	(revision 28001)
@@ -1,7 +1,9 @@
 Mon May 24 05:15:00 2010 Kirk Haines <khaines@r...>
 
-	* configure.in: Bug #2553 [ruby-core:27380]; Add a --disable-ucontext option, for use with --enable-pthreads, to avoid performance loss from --enable-pthreads and the oodles of sigprocmask calls that normally brings.
+	* configure.in: Bug #2553 [ruby-core:27380]; Add a --disable-ucontext option, for use with --enable-pthreads, to avoid performance loss from --enable-pthreads and the oodles of sigprocmask calls that normally brings. r27999
 
+	* lib/fileutils.rb: Backport #1700 [ruby-core:24078]; stringify group argument in #fu_get_gid before making regexp match.
+
 Thu May 20 04:10:00 2010 Kirk Haines <khaines@r...>
 
 	* lib/cgi.rb: Backport #229 [ruby-core:17634]; CGI::Cookie objects can get out of sync when CGI::Cookie#value= is used to assign a new value. Also, if a nil value ends up in the array of values for the cookie, CGI::Cookie#to_s would blow up on a gsub error when it tried to CGI::escape the nil value. This is fixed so that nils are treated as empty strings. r27932
Index: ruby_1_8_6/lib/fileutils.rb
===================================================================
--- ruby_1_8_6/lib/fileutils.rb	(revision 28000)
+++ ruby_1_8_6/lib/fileutils.rb	(revision 28001)
@@ -984,6 +984,7 @@
 
     def fu_get_gid(group)   #:nodoc:
       return nil unless group
+      group = group.to_s
       if /\A\d+\z/ =~ group
       then group.to_i
       else Etc.getgrnam(group).gid

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