зеркало из https://github.com/github/ruby.git
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
This commit is contained in:
Родитель
0e590199f9
Коммит
5559e75ea5
|
@ -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>
|
Mon Dec 15 17:51:28 2014 Koichi Sasada <ko1@atdot.net>
|
||||||
|
|
||||||
* ext/objspace/objspace.c: ObjectSpace.memsize_of(obj) returns
|
* ext/objspace/objspace.c: ObjectSpace.memsize_of(obj) returns
|
||||||
|
|
|
@ -93,8 +93,9 @@ class VCS
|
||||||
if modified
|
if modified
|
||||||
/\A(\d+)-(\d+)-(\d+)\D(\d+):(\d+):(\d+(?:\.\d+)?)\s*(?:Z|([-+]\d\d)(\d\d))\z/ =~ modified or
|
/\A(\d+)-(\d+)-(\d+)\D(\d+):(\d+):(\d+(?:\.\d+)?)\s*(?:Z|([-+]\d\d)(\d\d))\z/ =~ modified or
|
||||||
raise "unknown time format - #{modified}"
|
raise "unknown time format - #{modified}"
|
||||||
|
match = $~[1..6].map { |x| x.to_i }
|
||||||
begin
|
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
|
rescue ArgumentError
|
||||||
modified = Time.utc(*$~[1..6]) + $7.to_i * 3600 + $8.to_i * 60
|
modified = Time.utc(*$~[1..6]) + $7.to_i * 3600 + $8.to_i * 60
|
||||||
end
|
end
|
||||||
|
|
Загрузка…
Ссылка в новой задаче