shyouhei	2009-06-29 13:21:32 +0900 (Mon, 29 Jun 2009)

  New Revision: 23887

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

  Log:
    merge revision(s) 22937:
    * lib/fileutils.rb (FileUtils#fu_get_gid): stringify group
      argument before making regexp match.  [ruby-dev:38155]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/fileutils.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 23886)
+++ ruby_1_8_7/ChangeLog	(revision 23887)
@@ -1,3 +1,8 @@
+Mon Jun 29 13:18:42 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/fileutils.rb (FileUtils#fu_get_gid): stringify group
+	  argument before making regexp match.  [ruby-dev:38155]
+
 Fri Jun 12 16:36:44 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* ext/bigdecimal/bigdecimal.c (VpToString): fixed a bug introduced
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 23886)
+++ ruby_1_8_7/version.h	(revision 23887)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-06-12"
+#define RUBY_RELEASE_DATE "2009-06-29"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090612
-#define RUBY_PATCHLEVEL 174
+#define RUBY_RELEASE_CODE 20090629
+#define RUBY_PATCHLEVEL 175
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 29
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/lib/fileutils.rb
===================================================================
--- ruby_1_8_7/lib/fileutils.rb	(revision 23886)
+++ ruby_1_8_7/lib/fileutils.rb	(revision 23887)
@@ -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/