Merge pull request #3105 from sjackman/pour_local_bottle
pour_bottle?: Pour local bottles without sha256
This commit is contained in:
commit
b2cd52d0b7
@ -85,13 +85,12 @@ class FormulaInstaller
|
|||||||
return false if @pour_failed
|
return false if @pour_failed
|
||||||
|
|
||||||
bottle = formula.bottle
|
bottle = formula.bottle
|
||||||
return false unless bottle
|
return false if !bottle && !formula.local_bottle_path
|
||||||
return true if force_bottle?
|
return true if force_bottle?
|
||||||
return false if build_from_source? || build_bottle? || interactive?
|
return false if build_from_source? || build_bottle? || interactive?
|
||||||
return false if ARGV.cc
|
return false if ARGV.cc
|
||||||
return false unless options.empty?
|
return false unless options.empty?
|
||||||
return false if formula.bottle_disabled?
|
return false if formula.bottle_disabled?
|
||||||
return true if formula.local_bottle_path
|
|
||||||
unless formula.pour_bottle?
|
unless formula.pour_bottle?
|
||||||
if install_bottle_options[:warn] && formula.pour_bottle_check_unsatisfied_reason
|
if install_bottle_options[:warn] && formula.pour_bottle_check_unsatisfied_reason
|
||||||
opoo <<-EOS.undent
|
opoo <<-EOS.undent
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user