From 78e6c3a65bd5f6deb1bc8b750ff86e364a96074f Mon Sep 17 00:00:00 2001 From: Luke Imhoff Date: Fri, 20 Jun 2014 14:32:29 -0500 Subject: [PATCH] Fix merge error While helping Dave Maloney port the changes from lib/msfenv.rb to config/boot.rb for the Gemfile.local support, I failed to notice that root was only defined in the unless block when it is needed no matter what. --- config/boot.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/config/boot.rb b/config/boot.rb index 52665cb527..d1c7a63765 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -6,12 +6,12 @@ GEMFILE_EXTENSIONS = [ '' ] +msfenv_real_pathname = Pathname.new(__FILE__).realpath +root = msfenv_real_pathname.parent.parent + unless ENV['BUNDLE_GEMFILE'] require 'pathname' - msfenv_real_pathname = Pathname.new(__FILE__).realpath - root = msfenv_real_pathname.parent.parent - GEMFILE_EXTENSIONS.each do |extension| extension_pathname = root.join("Gemfile#{extension}") @@ -22,7 +22,6 @@ unless ENV['BUNDLE_GEMFILE'] end end - begin require 'bundler' rescue LoadError @@ -31,7 +30,6 @@ rescue LoadError exit(0) end - Bundler.setup lib_path = root.join('lib').to_path