From fe099c142ebfdd059b44e5ca7abbdb08659d51ed Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Sat, 5 Aug 2017 10:41:39 -0700 Subject: [PATCH] do not blow up when RUBYOPT is not defined --- lib/puma/launcher.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puma/launcher.rb b/lib/puma/launcher.rb index 48867b2c85..327d8dd6ab 100644 --- a/lib/puma/launcher.rb +++ b/lib/puma/launcher.rb @@ -165,10 +165,10 @@ def phased_restart def run previous_env = if defined?(Bundler) - env = Bundler::ORIGINAL_ENV + env = Bundler::ORIGINAL_ENV.dup # add -rbundler/setup so we load from Gemfile when restarting bundle = "-rbundler/setup" - env["RUBYOPT"] = [env["RUBYOPT"], bundle].join(" ") unless env["RUBYOPT"].include?(bundle) + env["RUBYOPT"] = [env["RUBYOPT"], bundle].join(" ") unless env["RUBYOPT"].to_s.include?(bundle) env else ENV.to_h