From 29927214d42105dfa82582401f9a7485c243b2c7 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 19 Nov 2008 22:35:40 +0000 Subject: [PATCH] * 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/trunk@20290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/logger.rb | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9455c80334..223e2873f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 20 07:33:15 2008 Yukihiro Matsumoto + + * 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 * lib/minitest/unit.rb (MiniTest::Assertions#capture_io): adjust 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