diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-15 20:44:54 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-15 20:44:54 +0000 |
| commit | 5559e75ea557217b5298a2000315e472b03725c8 (patch) | |
| tree | bd74003c41c3274a2407ca59686cf552d34d9a2a | |
| parent | 0e590199f9592fe6a513ecae18d0724f0e69260c (diff) | |
tool/vcs.rb: fix Ruby 1.8 compatibility
Symbol#to_proc is not standard in Ruby 1.8
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | tool/vcs.rb | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Tue Dec 16 05:41:46 2014 Eric Wong <[email protected]> + + * tool/vcs.rb: fix Ruby 1.8 compatibility + Mon Dec 15 17:51:28 2014 Koichi Sasada <[email protected]> * ext/objspace/objspace.c: ObjectSpace.memsize_of(obj) returns diff --git a/tool/vcs.rb b/tool/vcs.rb index 0866131926..8b99533c61 100644 --- a/tool/vcs.rb +++ b/tool/vcs.rb @@ -93,8 +93,9 @@ class VCS if modified /\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 } begin - modified = Time.new(*$~[1..6].map(&:to_i), ($7 ? "#{$7}:#{$8}" : "+00:00")) + modified = Time.new(*match, ($7 ? "#{$7}:#{$8}" : "+00:00")) rescue ArgumentError modified = Time.utc(*$~[1..6]) + $7.to_i * 3600 + $8.to_i * 60 end |