diff options
| author | Jack Nagel | 2014-03-10 14:56:02 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-03-10 14:56:02 -0500 |
| commit | 2db33e73cdb2ab78db23db9c670cdbe285def368 (patch) | |
| tree | 5bd3e15ac00109bd61242620aacfeefe36313142 | |
| parent | b480589062f8452c92f4edfd60854cb3d5ecee9e (diff) | |
| download | homebrew-2db33e73cdb2ab78db23db9c670cdbe285def368.tar.bz2 | |
Remove used options check from install_bottle?
This is now handled by requiring that options are always passed to the
installer explicitly.
| -rw-r--r-- | Library/Homebrew/bottles.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/formula.rb | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb index 35654cd23..80778b2b5 100644 --- a/Library/Homebrew/bottles.rb +++ b/Library/Homebrew/bottles.rb @@ -12,7 +12,6 @@ def install_bottle? f, options={:warn=>false} return true if f.local_bottle_path return true if ARGV.force_bottle? return false unless f.pour_bottle? - return false unless f.default_build? return false unless f.bottle if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index f2ba1a235..71e2a730c 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -80,10 +80,6 @@ class Formula end end - def default_build? - self.class.build.used_options.empty? - end - def determine_build_options build = active_spec.build options.each { |opt, desc| build.add(opt, desc) } |
