Permalink
Browse files

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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@22285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 301500e commit b468a979d05b305cef6037c64cefdb3b93ef43e8 @shyouhei shyouhei committed Feb 13, 2009
Showing with 12 additions and 3 deletions.
  1. +5 −0 ChangeLog
  2. +2 −2 lib/logger.rb
  3. +4 −0 test/logger/test_logger.rb
  4. +1 −1 version.h
View
@@ -1,3 +1,8 @@
+Fri Feb 13 19:18:42 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:54 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
* shell/command-processor.rb: undefined method `top_level_test' in
View
@@ -170,8 +170,8 @@
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
@@ -23,6 +23,10 @@ def setup
@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)
View
@@ -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

0 comments on commit b468a97

Please sign in to comment.