diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | tool/vcs.rb | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Tue Dec 16 08:53:12 2014 Eric Wong <[email protected]> + + * tool/vcs.rb: fix Ruby 1.8 compatibility harder + Tue Dec 16 07:37:18 2014 Eric Wong <[email protected]> * gc.c (GC_HEAP_FREE_SLOTS): move definition to match use order 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 |