summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-14 01:46:22 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-14 01:46:22 +0000
commit9b04c1dd420743539c76e3b3826301f78fbbaede (patch)
treeeb7883a57ec1daabc96eca22c87b6b128808ca40
parentf4a513650455ff44b05cbfc76a71961dd8e49400 (diff)
* tool/runruby.rb: just remove the lines of RUBY_VERSION check and raise
instead of replacing the check to `true`, for getting rid of a warning `possibly useless use of true in void context`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rwxr-xr-xtool/runruby.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 92e8f5b..c69e165 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 14 10:43:50 2015 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * tool/runruby.rb: just remove the lines of RUBY_VERSION check and raise
+ instead of replacing the check to `true`, for getting rid of a
+ warning `possibly useless use of true in void context`.
+
Sun Jun 14 10:13:55 2015 Kouhei Sutou <kou@cozmixng.org>
* lib/rexml/source.rb (REXML::IOSource#scan): Fix a typo in
diff --git a/tool/runruby.rb b/tool/runruby.rb
index 34b51da..c6aaaa9 100755
--- a/tool/runruby.rb
+++ b/tool/runruby.rb
@@ -47,7 +47,7 @@ abs_archdir = File.expand_path(archdir)
$:.unshift(abs_archdir)
config = File.read(conffile = File.join(abs_archdir, 'rbconfig.rb'))
-config.sub!(/^(\s*)RUBY_VERSION\b.*(\sor\s*)$/, '\1true\2')
+config.sub!(/^(\s*)RUBY_VERSION\b.*(\sor\s*)\n.*\n/, '')
config = Module.new {module_eval(config, conffile)}::RbConfig::CONFIG
ruby = File.join(archdir, config["RUBY_INSTALL_NAME"]+config['EXEEXT'])