aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--tool/vcs.rb3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 15c5f0dc8c..ed4800125f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 16 05:41:46 2014 Eric Wong <e@80x24.org>
+
+ * tool/vcs.rb: fix Ruby 1.8 compatibility
+
Mon Dec 15 17:51:28 2014 Koichi Sasada <ko1@atdot.net>
* 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