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
commit5cbabc7cb5bc8af8658c39a3d84986a725d702c6 (patch)
tree23f423d2933fa27c6011c289e4e21511574b2fad /Library
parent2bff911b93a429f9e263477d80bcb1b4e1751c83 (diff)
downloadhomebrew-5cbabc7cb5bc8af8658c39a3d84986a725d702c6.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