diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-29 04:21:32 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-29 04:21:32 +0000 |
commit | fec18c0bc2656e1bc7afd4ec1f99523555e75616 (patch) | |
tree | 4963d3105ab8882cd7cb337c186b1c482cbb99c4 | |
parent | 5eef94c8ced11a5d39c38566492cf059c92d8ad2 (diff) |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/fileutils.rb | 1 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Mon Jun 29 13:18:42 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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@ruby-lang.org> * 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 @@ -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[]; |