yugui	2010-01-30 21:44:58 +0900 (Sat, 30 Jan 2010)

  New Revision: 26475

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

  Log:
    merges r25263 from trunk into ruby_1_9_1.
    --
    * lib/net/telnet.rb (cmd): Pass FailEOF options: patch by Brian Candler [ruby-core:22723]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/net/telnet.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 26474)
+++ ruby_1_9_1/ChangeLog	(revision 26475)
@@ -1,3 +1,8 @@
+Fri Oct  9 00:33:29 2009  Marc-Andre Lafortune  <ruby-core@m...>
+
+	* lib/net/telnet.rb (cmd): Pass FailEOF options: patch by Brian
+	  Candler [ruby-core:22723]
+
 Mon Oct  5 17:19:33 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/delegate.rb (Delegator::public_api): take snapshot of
Index: ruby_1_9_1/lib/net/telnet.rb
===================================================================
--- ruby_1_9_1/lib/net/telnet.rb	(revision 26474)
+++ ruby_1_9_1/lib/net/telnet.rb	(revision 26475)
@@ -681,20 +681,22 @@
     def cmd(options) # :yield: recvdata
       match    = @options["Prompt"]
       time_out = @options["Timeout"]
+      fail_eof = @options["FailEOF"]
 
       if options.kind_of?(Hash)
         string   = options["String"]
         match    = options["Match"]   if options.has_key?("Match")
         time_out = options["Timeout"] if options.has_key?("Timeout")
+        fail_eof = options["FailEOF"] if options.has_key?("FailEOF")
       else
         string = options
       end
 
       self.puts(string)
       if block_given?
-        waitfor({"Prompt" => match, "Timeout" => time_out}){|c| yield c }
+        waitfor({"Prompt" => match, "Timeout" => time_out, "FailEOF" => fail_eof}){|c| yield c }
       else
-        waitfor({"Prompt" => match, "Timeout" => time_out})
+        waitfor({"Prompt" => match, "Timeout" => time_out, "FailEOF" => fail_eof})
       end
     end
 
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26474)
+++ ruby_1_9_1/version.h	(revision 26475)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 380
+#define RUBY_PATCHLEVEL 381
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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