From 9d46a8085e643b4dee91a558d5a8d32ba331925a Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 11 Aug 2011 00:37:50 +0000 Subject: merges r32242 from trunk into ruby_1_9_2. -- * test/etc/test_etc.rb (TestEtc#test_get{pw,gr}nam): skip entries start with + sign, which means NIS. these are returned in the case that passwd and group entries in /etc/nsswitch.conf are set to use "nis" explicitly on Debian. fixed #3683 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ test/etc/test_etc.rb | 6 ++++-- version.h | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a76e5144d7..11905f9f97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Jun 27 01:34:18 2011 Nobuyoshi Nakada + + * test/etc/test_etc.rb (TestEtc#test_get{pw,gr}nam): skip entries + start with + sign, which means NIS. these are returned in the + case that passwd and group entries in /etc/nsswitch.conf are set + to use "nis" explicitly on Debian. fixed #3683 + Mon Jun 27 00:44:53 2011 NARUSE, Yui * parse.y (rb_parser_end_seen_p): fix documentation about return diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb index 8fb3b485a3..c4db71cdf4 100644 --- a/test/etc/test_etc.rb +++ b/test/etc/test_etc.rb @@ -38,7 +38,9 @@ class TestEtc < Test::Unit::TestCase def test_getpwnam passwd = {} - Etc.passwd {|s| passwd[s.name] ||= s } + Etc.passwd do |s| + passwd[s.name] ||= s unless /\A\+/ =~ s.name + end passwd.each_value do |s| assert_equal(s, Etc.getpwnam(s.name)) end @@ -80,7 +82,7 @@ class TestEtc < Test::Unit::TestCase def test_getgrnam groups = {} Etc.group do |s| - groups[s.name] ||= s + groups[s.name] ||= s unless /\A\+/ =~ s.name end groups.each_value do |s| assert_equal(s, Etc.getgrnam(s.name)) diff --git a/version.h b/version.h index bdd83049bf..3d123d4f5d 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 295 +#define RUBY_PATCHLEVEL 296 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3