diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-19 13:33:01 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-19 13:33:01 +0000 |
commit | f3d49a0af2861dc1416ce704de5c07a88c1692fe (patch) | |
tree | ec32620a6d1bc3494236b6069f6f331225ee247a | |
parent | 6610034374b705dc38828be3fe3938eb71f545a5 (diff) |
merges r22940 from trunk into ruby_1_9_1.
--
* 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_9_1@23215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/fileutils.rb | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Fri Mar 13 09:17:12 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 Mar 13 15:10:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): should use diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 32408ee868..b1e20f64e2 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -987,6 +987,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 |