summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-13 10:18:12 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-13 10:18:12 (GMT)
commitdaccc3c197002c267b59b5fde7697aee1053431c (patch)
tree5ed7435a4d21fc4b72383456d471fdfecde4acc7
parent59356f734385ee6a3ffcde6ce94eeb7ef7a7f721 (diff)
merge revision(s) 20245,20247:
* lib/logger.rb (ProgName): fixed for svn, based on a patch from Nobuhiro IMAI at [ruby-dev:37108]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/logger.rb4
-rw-r--r--test/logger/test_logger.rb4
-rw-r--r--version.h2
4 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b006e2f..4c7870b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 13 19:17:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/logger.rb (ProgName): fixed for svn, based on a patch from
+ Nobuhiro IMAI at [ruby-dev:37108].
+
Fri Feb 13 19:04:06 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
* shell/command-processor.rb: undefined method `top_level_test' in
diff --git a/lib/logger.rb b/lib/logger.rb
index 60e7242..e9ab171 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 ab578a1..5969854 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 0c2a3e5..73f4e4f 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-13"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20090213
-#define RUBY_PATCHLEVEL 329
+#define RUBY_PATCHLEVEL 330
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8