yugui	2011-08-11 09:37:50 +0900 (Thu, 11 Aug 2011)

  New Revision: 32910

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32910

  Log:
    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

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/etc/test_etc.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 32909)
+++ ruby_1_9_2/ChangeLog	(revision 32910)
@@ -1,3 +1,10 @@
+Mon Jun 27 01:34:18 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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  <naruse@r...>
 
 	* parse.y (rb_parser_end_seen_p): fix documentation about return
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 32909)
+++ ruby_1_9_2/version.h	(revision 32910)
@@ -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
Index: ruby_1_9_2/test/etc/test_etc.rb
===================================================================
--- ruby_1_9_2/test/etc/test_etc.rb	(revision 32909)
+++ ruby_1_9_2/test/etc/test_etc.rb	(revision 32910)
@@ -38,7 +38,9 @@
 
   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 @@
   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))

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/