diff options
author | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-24 17:25:00 +0000 |
---|---|---|
committer | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-24 17:25:00 +0000 |
commit | 646a31fb9adc3ca2d3a62db3ec511df22f5c7294 (patch) | |
tree | 1206c1e72930f63dea242f1cafde2a8ef3fb1803 | |
parent | 1ecd9885e0284f13378a84b8bc2a0b16d9e1a27c (diff) |
Backport #1700 [ruby-core:24078]; Stringify group argument in #fu_get_gid before making regexp match.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@28001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/fileutils.rb | 1 |
2 files changed, 4 insertions, 1 deletions
@@ -1,6 +1,8 @@ Mon May 24 05:15:00 2010 Kirk Haines <khaines@ruby-lang.org> - * configure.in: Bug #2553 [ruby-core:27380]; Add a --disable-ucontext option, for use with --enable-pthreads, to avoid performance loss from --enable-pthreads and the oodles of sigprocmask calls that normally brings. + * configure.in: Bug #2553 [ruby-core:27380]; Add a --disable-ucontext option, for use with --enable-pthreads, to avoid performance loss from --enable-pthreads and the oodles of sigprocmask calls that normally brings. r27999 + + * lib/fileutils.rb: Backport #1700 [ruby-core:24078]; stringify group argument in #fu_get_gid before making regexp match. Thu May 20 04:10:00 2010 Kirk Haines <khaines@ruby-lang.org> 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 |