Merge pull request #804 from MikeMcQuaid/brewfile-unset

Improve HOMEBREW_BREW_FILE unset failure case.

3 files changed, 13 insertions, 5 deletions

diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb
index d4e348c3f..78c8ee5f5 100644
--- a/Library/Homebrew/brew.rb
+++ b/Library/Homebrew/brew.rb
@@ -1,3 +1,7 @@
+unless ENV["HOMEBREW_BREW_FILE"]
+  raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
+end
+
 std_trap = trap("INT") { exit! 130 } # no backtrace thanks
 
 # check ruby version before requiring any modules.
diff --git a/Library/Homebrew/config.rb b/Library/Homebrew/config.rb
index 70a2386a9..cef615365 100644
--- a/Library/Homebrew/config.rb
+++ b/Library/Homebrew/config.rb
@@ -1,10 +1,10 @@
-if ENV["HOMEBREW_BREW_FILE"]
-  # Path to `bin/brew` main executable in {HOMEBREW_PREFIX}
-  HOMEBREW_BREW_FILE = Pathname.new(ENV["HOMEBREW_BREW_FILE"])
-else
-  odie "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
+unless ENV["HOMEBREW_BREW_FILE"]
+  raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
 end
 
+# Path to `bin/brew` main executable in HOMEBREW_PREFIX
+HOMEBREW_BREW_FILE = Pathname.new(ENV["HOMEBREW_BREW_FILE"])
+
 # Where we link under
 HOMEBREW_PREFIX = Pathname.new(ENV["HOMEBREW_PREFIX"])
 
diff --git a/Library/Homebrew/test/lib/config.rb b/Library/Homebrew/test/lib/config.rb
index 742d8e0a0..713bc9c3a 100644
--- a/Library/Homebrew/test/lib/config.rb
+++ b/Library/Homebrew/test/lib/config.rb
@@ -1,3 +1,7 @@
+unless ENV["HOMEBREW_BREW_FILE"]
+  raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
+end
+
 require "tmpdir"
 require "pathname"