yugui	2008-11-19 01:48:40 +0900 (Wed, 19 Nov 2008)

  New Revision: 20272

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

  Log:
    merges r20245 and r20246 from trunk into ruby_1_9_1.
    * lib/logger.rb (ProgName): fixed for svn, based on a patch from
      Nobuhiro IMAI at [ruby-dev:37108].

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/logger.rb
    branches/ruby_1_9_1/test/logger/test_logger.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20271)
+++ ruby_1_9_1/ChangeLog	(revision 20272)
@@ -1,3 +1,8 @@
+Tue Nov 18 16:18:23 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/logger.rb (ProgName): fixed for svn, based on a patch from
+	  Nobuhiro IMAI at [ruby-dev:37108].
+
 Tue Nov 18 15:56:55 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_request_line): 
Index: ruby_1_9_1/lib/logger.rb
===================================================================
--- ruby_1_9_1/lib/logger.rb	(revision 20271)
+++ ruby_1_9_1/lib/logger.rb	(revision 20272)
@@ -181,8 +181,8 @@
 
 class Logger
   VERSION = "1.2.6"
-  /: (\S+),v (\S+)/ =~ %q$Id$
-  ProgName = "#{$1}/#{$2}"
+  id, name, rev = %w$Id$
+  ProgName = "#{name.chomp(",v")}/#{rev}"
 
   class Error < RuntimeError; end
   class ShiftingError < Error; end
Index: ruby_1_9_1/test/logger/test_logger.rb
===================================================================
--- ruby_1_9_1/test/logger/test_logger.rb	(revision 20271)
+++ ruby_1_9_1/test/logger/test_logger.rb	(revision 20272)
@@ -23,6 +23,10 @@
     @logger = Logger.new(nil)
   end
 
+  def test_const_progname
+    assert %r!\Alogger\.rb/\S+\z! === Logger::ProgName
+  end
+
   class Log
     attr_reader :label, :datetime, :pid, :severity, :progname, :msg
     def initialize(line)

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