From 90899c50c2890a70e7ce812a41f88b878ec50adc Mon Sep 17 00:00:00 2001 From: Daniel Niknam Date: Thu, 22 Jul 2021 01:02:40 +1000 Subject: [PATCH] [rubygems/rubygems] Remove LoadError message in regards to requiring a relative file Ruby 1.9.2 removed "." from LOAD_PATH for robustness and security reasons. This code was introduced by https://github.com/rubygems/rubygems/commit/56fc830e19a573a5905eba7f4714ad1f21ed1927 commit to helping users understand the issue and had a guard condition to include the message for `RUBY_VERSION >= "1.9"`. However, the guard condition was removed as part of the "Ruby version leftover" cleanup by https://github.com/rubygems/rubygems/commit/8c9cf76e419fbd8ba83144d701b24ca388813b14 Ruby 1.9 development was ended a long time ago and this message is not useful anymore. https://github.com/rubygems/rubygems/commit/a23609b15a --- lib/bundler.rb | 4 ---- spec/bundler/runtime/setup_spec.rb | 1 - 2 files changed, 5 deletions(-) diff --git a/lib/bundler.rb b/lib/bundler.rb index b88bab8f0a..791831d0e7 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -653,10 +653,6 @@ EOF rescue ScriptError, StandardError => e msg = "There was an error while loading `#{path.basename}`: #{e.message}" - if e.is_a?(LoadError) - msg += "\nDoes it try to require a relative path? That's been removed in Ruby 1.9" - end - raise GemspecError, Dsl::DSLError.new(msg, path, e.backtrace, contents) end diff --git a/spec/bundler/runtime/setup_spec.rb b/spec/bundler/runtime/setup_spec.rb index 380db99136..e5662cc9ad 100644 --- a/spec/bundler/runtime/setup_spec.rb +++ b/spec/bundler/runtime/setup_spec.rb @@ -1066,7 +1066,6 @@ end expect(err.lines.map(&:chomp)).to include( a_string_starting_with("[!] There was an error while loading `bar.gemspec`:"), - a_string_starting_with("Does it try to require a relative path? That's been removed in Ruby 1.9."), " # from #{default_bundle_path "bundler", "gems", "bar-1.0-#{ref[0, 12]}", "bar.gemspec"}:1", " > require 'foobarbaz'" )