shyouhei	2009-02-13 19:19:04 +0900 (Fri, 13 Feb 2009)

  New Revision: 22285

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

  Log:
    merge revision(s) 20245,20247:
    * lib/logger.rb (ProgName): fixed for svn, based on a patch from
      Nobuhiro IMAI at [ruby-dev:37108].

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/logger.rb
    branches/ruby_1_8_7/test/logger/test_logger.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22284)
+++ ruby_1_8_7/ChangeLog	(revision 22285)
@@ -1,3 +1,8 @@
+Fri Feb 13 19:18:42 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/logger.rb (ProgName): fixed for svn, based on a patch from
+	  Nobuhiro IMAI at [ruby-dev:37108].
+
 Fri Feb 13 19:04:54 2009  Keiju Ishitsuka  <keiju@r...>
 
 	* shell/command-processor.rb: undefined method `top_level_test' in
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22284)
+++ ruby_1_8_7/version.h	(revision 22285)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-02-13"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090213
-#define RUBY_PATCHLEVEL 115
+#define RUBY_PATCHLEVEL 116
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/logger.rb
===================================================================
--- ruby_1_8_7/lib/logger.rb	(revision 22284)
+++ ruby_1_8_7/lib/logger.rb	(revision 22285)
@@ -170,8 +170,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_8_7/test/logger/test_logger.rb
===================================================================
--- ruby_1_8_7/test/logger/test_logger.rb	(revision 22284)
+++ ruby_1_8_7/test/logger/test_logger.rb	(revision 22285)
@@ -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/