infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
bug/bundler_fix
Luke Imhoff 2014-06-20 14:32:29 -05:00
parent 35c0ef0c68
commit 78e6c3a65b
No known key found for this signature in database
GPG Key ID: 5B1FB01FB33356F8
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/boot.rb
View File

@ -6,12 +6,12 @@ GEMFILE_EXTENSIONS = [
'' ''
] ]
unless ENV['BUNDLE_GEMFILE']
require 'pathname'
msfenv_real_pathname = Pathname.new(__FILE__).realpath msfenv_real_pathname = Pathname.new(__FILE__).realpath
root = msfenv_real_pathname.parent.parent root = msfenv_real_pathname.parent.parent
unless ENV['BUNDLE_GEMFILE']
require 'pathname'
GEMFILE_EXTENSIONS.each do |extension| GEMFILE_EXTENSIONS.each do |extension|
extension_pathname = root.join("Gemfile#{extension}") extension_pathname = root.join("Gemfile#{extension}")
@ -22,7 +22,6 @@ unless ENV['BUNDLE_GEMFILE']
end end
end end
begin begin
require 'bundler' require 'bundler'
rescue LoadError rescue LoadError
@ -31,7 +30,6 @@ rescue LoadError
exit(0) exit(0)
end end
Bundler.setup Bundler.setup
lib_path = root.join('lib').to_path lib_path = root.join('lib').to_path