diff --git a/ChangeLog b/ChangeLog index 9c338d6c4d..febab9e135 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Feb 13 19:18:42 2009 Nobuyoshi Nakada + + * lib/logger.rb (ProgName): fixed for svn, based on a patch from + Nobuhiro IMAI at [ruby-dev:37108]. + Fri Feb 13 19:04:54 2009 Keiju Ishitsuka * shell/command-processor.rb: undefined method `top_level_test' in diff --git a/lib/logger.rb b/lib/logger.rb index 9030fa1d0d..15d95fcb10 100644 --- a/lib/logger.rb +++ b/lib/logger.rb @@ -170,8 +170,8 @@ require 'monitor' class Logger VERSION = "1.2.6" - /: (\S+),v (\S+)/ =~ %q$Id$ - ProgName = "#{$1}/#{$2}" + id, name, rev = %w$Id$ + ProgName = "#{name.chomp(",v")}/#{rev}" class Error < RuntimeError; end class ShiftingError < Error; end diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb index ab578a1b81..5969854976 100644 --- a/test/logger/test_logger.rb +++ b/test/logger/test_logger.rb @@ -23,6 +23,10 @@ class TestLogger < Test::Unit::TestCase @logger = Logger.new(nil) end + def test_const_progname + assert %r!\Alogger\.rb/\S+\z! === Logger::ProgName + end + class Log attr_reader :label, :datetime, :pid, :severity, :progname, :msg def initialize(line) diff --git a/version.h b/version.h index 48a444dd04..4b4babb75f 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-13" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20090213 -#define RUBY_PATCHLEVEL 115 +#define RUBY_PATCHLEVEL 116 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8