From 1e92c0b98b6a1ea31c57284747033ec6672c2c9c Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 22 Nov 2008 14:52:06 +0000 Subject: 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 --- lib/logger.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib') 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 -- cgit v1.2.3