From 158f46c744cc09fd416af139396387ecc01973e1 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 19 Apr 2009 13:33:01 +0000 Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/fileutils.rb | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 076927a1b..dc9df1b3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 13 09:17:12 2009 Yukihiro Matsumoto + + * 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 * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): should use diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 32408ee86..b1e20f64e 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 -- cgit