From 9aeb74d0de8004440ddd50f1c20417d44b742ecd Mon Sep 17 00:00:00 2001 From: normal Date: Tue, 16 Dec 2014 00:08:14 +0000 Subject: tool/vcs.rb: fix Ruby 1.8 compatibility harder Arguments after splat do not work under 1.8, either. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/vcs.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tool') diff --git a/tool/vcs.rb b/tool/vcs.rb index 8b99533c61..71eb689f0e 100644 --- a/tool/vcs.rb +++ b/tool/vcs.rb @@ -94,8 +94,10 @@ class VCS /\A(\d+)-(\d+)-(\d+)\D(\d+):(\d+):(\d+(?:\.\d+)?)\s*(?:Z|([-+]\d\d)(\d\d))\z/ =~ modified or raise "unknown time format - #{modified}" match = $~[1..6].map { |x| x.to_i } + off = $7 ? "#{$7}:#{$8}" : "+00:00" + match << off begin - modified = Time.new(*match, ($7 ? "#{$7}:#{$8}" : "+00:00")) + modified = Time.new(*match) rescue ArgumentError modified = Time.utc(*$~[1..6]) + $7.to_i * 3600 + $8.to_i * 60 end -- cgit v1.2.3