From fec18c0bc2656e1bc7afd4ec1f99523555e75616 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 29 Jun 2009 04:21:32 +0000 Subject: merge revision(s) 22937: * lib/fileutils.rb (FileUtils#fu_get_gid): stringify group argument before making regexp match. [ruby-dev:38155] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@23887 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/fileutils.rb | 1 + version.h | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a435efdb94..b687051d3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 29 13:18:42 2009 Yukihiro Matsumoto + + * 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 * ext/bigdecimal/bigdecimal.c (VpToString): fixed a bug introduced diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 3fdb6cbfe6..3ef80ed601 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -984,6 +984,7 @@ module FileUtils 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 diff --git a/version.h b/version.h index cae2827132..69b80d3e49 100644 --- a/version.h +++ b/version.h @@ -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[]; -- cgit v1.2.3