archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-25 05:55:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merges r20290 from trunk into ruby_1_9_1

Browse source 
* 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
This commit is contained in:
yugui 2008-11-22 14:52:06 +00:00
parent dc3c09cbe0
commit 1e92c0b98b
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Nov 20 07:33:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* 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@ruby-lang.org> Thu Nov 20 07:27:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/minitest/unit.rb (MiniTest::Assertions#capture_io): adjust * lib/minitest/unit.rb (MiniTest::Assertions#capture_io): adjust

8
lib/logger.rb
View file

@ -182,7 +182,13 @@ require 'monitor'
class Logger class Logger
VERSION = "1.2.6" VERSION = "1.2.6"
id, name, rev = %w$Id$ 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 Error < RuntimeError; end
class ShiftingError < Error; end class ShiftingError < Error; end