aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-03-08 16:54:19 -0600
committerJack Nagel2014-03-08 18:50:00 -0600
commita4659508748ca0d1495dbb68c7a09af22d979e9d (patch)
treeb48a753f0b35c48cea1c2f2b237ec4cec63a885e /Library
parent53a25584730eee0de460b05cafd12d3ac8910f35 (diff)
downloadbrew-a4659508748ca0d1495dbb68c7a09af22d979e9d.tar.bz2
Sanitize ARGV options that are reflected in the installer mode
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/formula_installer.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 02a753bd5..096e1509e 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -386,8 +386,15 @@ class FormulaInstaller
@build_time ||= Time.now - @start_time unless pour_bottle? or ARGV.interactive? or @start_time.nil?
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
- opts = Options.coerce(ARGV.options_only)
+ opts = Options.coerce(sanitized_ARGV_options)
opts.concat(options) unless opts.include? "--fresh"
opts << Option.new("--build-from-source") # don't download bottle
end