admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Sanitize ARGV options that are reflected in the installer mode

Browse Source
This commit is contained in:
Jack Nagel 2014-03-08 16:54:19 -06:00
parent 53a2558473
commit a465950874
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/formula_installer.rb
View File

@ -386,8 +386,15 @@ class FormulaInstaller
@build_time ||= Time.now - @start_time unless pour_bottle? or ARGV.interactive? or @start_time.nil? @build_time ||= Time.now - @start_time unless pour_bottle? or ARGV.interactive? or @start_time.nil?
end end
def sanitized_ARGV_options
args = ARGV.options_only
args.delete "--ignore-dependencies" unless ignore_deps
args.delete "--only-dependencies" unless only_deps
args
end
def build_argv def build_argv
opts = Options.coerce(ARGV.options_only) opts = Options.coerce(sanitized_ARGV_options)
opts.concat(options) unless opts.include? "--fresh" opts.concat(options) unless opts.include? "--fresh"
opts << Option.new("--build-from-source") # don't download bottle opts << Option.new("--build-from-source") # don't download bottle
end end