yugui	2008-11-22 23:52:06 +0900 (Sat, 22 Nov 2008)

  New Revision: 20321

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

  Log:
    merges r20290 from trunk into ruby_1_9_1
    * lib/logger.rb (Logger): should handle the case that cvs/svn do
      not expand $Id keyword.  [ruby-core:19991]

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

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20320)
+++ ruby_1_9_1/ChangeLog	(revision 20321)
@@ -1,3 +1,8 @@
+Thu Nov 20 07:33:15 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/logger.rb (Logger): should handle the case that cvs/svn do
+	  not expand $Id keyword.  [ruby-core:19991]
+
 Thu Nov 20 07:27:36 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/minitest/unit.rb (MiniTest::Assertions#capture_io): adjust
Index: ruby_1_9_1/lib/logger.rb
===================================================================
--- ruby_1_9_1/lib/logger.rb	(revision 20320)
+++ ruby_1_9_1/lib/logger.rb	(revision 20321)
@@ -182,7 +182,13 @@
 class Logger
   VERSION = "1.2.6"
   id, name, rev = %w$Id$
-  ProgName = "#{name.chomp(",v")}/#{rev}"
+  if name
+    name = name.chomp(",v")
+  else
+    name = File.basename(__FILE__)
+  end
+  rev ||= "v#{VERSION}"
+  ProgName = "#{name}/#{rev}"
 
   class Error < RuntimeError; end
   class ShiftingError < Error; end

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