summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-13 22:42:16 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-13 22:42:16 +0000
commitafed5832bf5bbfa0cbb7e9150520602fec97a462 (patch)
treeb876e7e04f951b1810efdb19a7ceb809074cdaa2
parent1cd707310eea92e1d5c235d5768dae0994eedf5b (diff)
downloadruby-afed5832bf5bbfa0cbb7e9150520602fec97a462.tar.gz
ruby-afed5832bf5bbfa0cbb7e9150520602fec97a462.tar.xz
ruby-afed5832bf5bbfa0cbb7e9150520602fec97a462.zip
* 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/trunk@22940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/fileutils.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 43a77d4a5..39082a5d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,11 @@ Fri Mar 13 09:30:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (bigfixize): zero length Bignum is 0.
+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 08:06:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* util.c (rv_strdup): macro to duplicate nul-terminated string.
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index f2302703b..6124f2989 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