[前][次][番号順一覧][スレッド一覧]

ruby-changes:57248

From: Yusuke <ko1@a...>
Date: Sun, 25 Aug 2019 19:32:09 +0900 (JST)
Subject: [ruby-changes:57248] Yusuke Endoh: 6944a1aa4f (master): lib/webrick.rb: use require_relative for webrick/utils.rb

https://git.ruby-lang.org/ruby.git/commit/?id=6944a1aa4f

From 6944a1aa4f805c19faa3340f841a459f907f840e Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@r...>
Date: Sun, 25 Aug 2019 19:29:52 +0900
Subject: lib/webrick.rb: use require_relative for webrick/utils.rb

`require "webrick/utils.rb"` should load `lib/webrick/utils.rb`, but on
some CI machines, it wrongly loads `test/webrick/utils.rb`, which caused
circular require warning:

https://rubyci.org/logs/rubyci.s3.amazonaws.com/ubuntu/ruby-master/log/20190825T093007Z.log.html.gz
```
/data/chkbuild/tmp/build/20190825T093007Z/ruby/lib/rubygems/core_ext/kernel_require.rb:61: warning: /data/chkbuild/tmp/build/20190825T093007Z/ruby/lib/rubygems/core_ext/kernel_require.rb:61: warning: loading in progress, circular require considered harmful - /data/chkbuild/tmp/build/20190825T093007Z/ruby/lib/webrick.rb
```

diff --git a/lib/webrick.rb b/lib/webrick.rb
index cbaf18a..1c0eb81 100644
--- a/lib/webrick.rb
+++ b/lib/webrick.rb
@@ -212,7 +212,7 @@ require 'webrick/version.rb' https://github.com/ruby/ruby/blob/trunk/lib/webrick.rb#L212
 require 'webrick/config.rb'
 require 'webrick/log.rb'
 require 'webrick/server.rb'
-require 'webrick/utils.rb'
+require_relative 'webrick/utils.rb'
 require 'webrick/accesslog'
 
 require 'webrick/htmlutils.rb'
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]