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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/logger.rb b/lib/logger.rb
index 26d7d9d560..07699e7017 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -182,7 +182,13 @@ require 'monitor'
 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