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].

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ac6ba2b01..26827af4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 18 16:18:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_request_line): 
diff --git a/lib/logger.rb b/lib/logger.rb
index 5399e13ea..26d7d9d56 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -181,8 +181,8 @@ require 'monitor'
 
 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
diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb
index c7d553c41..a6c132d0f 100644
--- a/test/logger/test_logger.rb
+++ b/test/logger/test_logger.rb
@@ -23,6 +23,10 @@ class TestLogger < Test::Unit::TestCase
     @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)