Skip to content

Commit

Permalink
Stop Bundler from using load to launch an executable in-process in bu…
Browse files Browse the repository at this point in the history
…ndle exec.

See rubygems/bundler#6090. This stops
SignalException from being handled by Bundler when using `bundle exec`
and instead by Ruby. As of Puma 3.10.0, Puma changed the SIGTERM
hanlding to be passed back to the parent process, `bundle exec` in this
case.
  • Loading branch information
hone committed Jan 15, 2018
1 parent 1c5d2ae commit 7c4de20
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/language_pack/ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,9 @@ def build_bundler(default_bundle_without)
"RUBYOPT" => syck_hack,
"NOKOGIRI_USE_SYSTEM_LIBRARIES" => "true",
"JAVA_HOME" => noshellescape("#{pwd}/$JAVA_HOME"),
"BUNDLE_DISABLE_VERSION_CHECK" => "true"
"BUNDLE_DISABLE_VERSION_CHECK" => "true",
# https://github.com/bundler/bundler/issues/6090
"BUNDLE_DISABLE_EXEC_LOAD" => "true"
}
env_vars["BUNDLER_LIB_PATH"] = "#{bundler_path}" if ruby_version.ruby_version == "1.8.7"
puts "Running: #{bundle_command}"
Expand Down

0 comments on commit 7c4de20

Please sign in to comment.