diff options
| author | Jack Nagel | 2014-04-22 15:35:54 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-04-22 15:37:34 -0500 |
| commit | 61ec36bbe1fdfe3eb9471a84a1598f95a101b357 (patch) | |
| tree | bfb53770107cc20ebc286d843979ac028a036df9 | |
| parent | 0a65d5c8c1924995b6eff6971cdd07dbb63bfc18 (diff) | |
| download | homebrew-61ec36bbe1fdfe3eb9471a84a1598f95a101b357.tar.bz2 | |
Simplify conditions for superenv activation
`MacOS::Xcode.without_clt? && MacOS.sdk_path.nil?` should never be true.
In its earliest form, this would raise a bare RuntimeError in an effort
to have the bug reported. Later, it was changed to silently disable
superenv. But we don't want to do that. If there's a bug, or the user's
system is misconfigured, we want to know, so that we can fix the bug, or
the user can fix their system. So let's remove the condition.
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index dccf5c4f8..85aa23ebe 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -4,10 +4,7 @@ require 'extend/ENV/std' require 'extend/ENV/super' def superenv? - return false if MacOS::Xcode.without_clt? && MacOS.sdk_path.nil? - return false unless Superenv.bin && Superenv.bin.directory? - return false if ARGV.env == "std" - true + Superenv.bin && Superenv.bin.directory? && ARGV.env != "std" end module EnvActivation |