From c93dd36e0ef8bb07c96614ca6f3948eef72ca058 Mon Sep 17 00:00:00 2001 From: usa Date: Sat, 15 Nov 2014 10:46:38 +0000 Subject: revert previous commit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 7 ++----- lib/rubygems/core_ext/kernel_require.rb | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d801a6ad8b..1eb52047a3 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2050,11 +2050,8 @@ RULES suffixes << m[1] << m[2] implicit = [[m[1], m[2]], [m.post_match]] next - elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line - line.sub!(%r'(\s)*\#.*$', '') - comment = $& || '' - line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2} - line = line.chomp + comment + "\n" + elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line + line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2} end depout << line end diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb index 8f2cddee4d..bf9618d3bf 100755 --- a/lib/rubygems/core_ext/kernel_require.rb +++ b/lib/rubygems/core_ext/kernel_require.rb @@ -66,7 +66,7 @@ module Kernel begin RUBYGEMS_ACTIVATION_MONITOR.exit - return gem_original_require(spec.to_fullpath(path) || path) + return gem_original_require(path) end if spec # Attempt to find +path+ in any unresolved gems... -- cgit v1.2.3