diff options
| author | Mike McQuaid | 2017-08-31 19:26:56 +0100 |
|---|---|---|
| committer | GitHub | 2017-08-31 19:26:56 +0100 |
| commit | b2cd52d0b7f0fd7648f875a61c05a8b13279d281 (patch) | |
| tree | 41e0764d2551897f2f0abb2aa023821aabe4a98f /Library | |
| parent | bf5a58d6a408316b1a0bb172f9fb1942093dc4bd (diff) | |
| parent | 4cfd333c5a9fd32f1d9870b3e4987c7dad76a88a (diff) | |
| download | brew-b2cd52d0b7f0fd7648f875a61c05a8b13279d281.tar.bz2 | |
Merge pull request #3105 from sjackman/pour_local_bottle
pour_bottle?: Pour local bottles without sha256
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 6c5b8bdab..216a375ce 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -85,13 +85,12 @@ class FormulaInstaller return false if @pour_failed bottle = formula.bottle - return false unless bottle + return false if !bottle && !formula.local_bottle_path return true if force_bottle? return false if build_from_source? || build_bottle? || interactive? return false if ARGV.cc return false unless options.empty? return false if formula.bottle_disabled? - return true if formula.local_bottle_path unless formula.pour_bottle? if install_bottle_options[:warn] && formula.pour_bottle_check_unsatisfied_reason opoo <<-EOS.undent |