Skip to content

Commit 78e6c3a

Browse files
committed
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.
1 parent 35c0ef0 commit 78e6c3a

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

config/boot.rb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
''
77
]
88

9+
msfenv_real_pathname = Pathname.new(__FILE__).realpath
10+
root = msfenv_real_pathname.parent.parent
11+
912
unless ENV['BUNDLE_GEMFILE']
1013
require 'pathname'
1114

12-
msfenv_real_pathname = Pathname.new(__FILE__).realpath
13-
root = msfenv_real_pathname.parent.parent
14-
1515
GEMFILE_EXTENSIONS.each do |extension|
1616
extension_pathname = root.join("Gemfile#{extension}")
1717

@@ -22,7 +22,6 @@
2222
end
2323
end
2424

25-
2625
begin
2726
require 'bundler'
2827
rescue LoadError
@@ -31,7 +30,6 @@
3130
exit(0)
3231
end
3332

34-
3533
Bundler.setup
3634

3735
lib_path = root.join('lib').to_path

0 commit comments

Comments
 (0)