ARGV: Deprecate ARGV.force_bottle?
This commit is contained in:
parent
a5b6c5f262
commit
676ebf7419
@ -179,6 +179,12 @@ module Homebrew
|
||||
cmdline_args.include?("--build-from-source") || cmdline_args.include?("-s")
|
||||
end
|
||||
|
||||
def force_bottle
|
||||
return true if args_parsed && force_bottle?
|
||||
|
||||
cmdline_args.include?("--force-bottle")
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def downcased_unique_named
|
||||
|
||||
@ -40,10 +40,6 @@ module HomebrewArgvExtension
|
||||
arch&.to_sym
|
||||
end
|
||||
|
||||
def force_bottle?
|
||||
include?("--force-bottle")
|
||||
end
|
||||
|
||||
def cc
|
||||
value "cc"
|
||||
end
|
||||
|
||||
@ -5,7 +5,7 @@ module Homebrew
|
||||
module_function
|
||||
|
||||
def fetch_bottle?(f)
|
||||
return true if ARGV.force_bottle? && f.bottle
|
||||
return true if Homebrew.args.force_bottle && f.bottle
|
||||
return false unless f.bottle && f.pour_bottle?
|
||||
return false if Homebrew.args.build_formula_from_source?(f)
|
||||
return false unless f.bottle.compatible_cellar?
|
||||
|
||||
@ -51,7 +51,7 @@ class FormulaInstaller
|
||||
@only_deps = false
|
||||
@build_from_source = Homebrew.args.build_from_source
|
||||
@build_bottle = false
|
||||
@force_bottle = ARGV.force_bottle?
|
||||
@force_bottle = Homebrew.args.force_bottle
|
||||
@include_test = ARGV.include?("--include-test")
|
||||
@interactive = false
|
||||
@git = false
|
||||
|
||||
@ -95,7 +95,7 @@ class SoftwareSpec
|
||||
|
||||
def bottled?
|
||||
bottle_specification.tag?(Utils::Bottles.tag) && \
|
||||
(bottle_specification.compatible_cellar? || ARGV.force_bottle?)
|
||||
(bottle_specification.compatible_cellar? || Homebrew.args.force_bottle)
|
||||
end
|
||||
|
||||
def bottle(disable_type = nil, disable_reason = nil, &block)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user