diff options
| -rw-r--r-- | Library/Homebrew/cmd/upgrade.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ARGV.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 99954d91e..07558cbec 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -29,7 +29,7 @@ module Homebrew extend self end end - unless ARGV.include? '--ignore-dependencies' + unless ARGV.ignore_deps? # Expand the outdated list to include outdated dependencies then sort and # reduce such that dependencies are installed first and installation is not # attempted twice. Sorting is implicit the way `recursive_deps` returns diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 4b0c71d03..9c145d1ab 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -89,6 +89,10 @@ module HomebrewArgvExtension include?('--dry-run') || switch?('n') end + def ignore_deps? + include? '--ignore-dependencies' + end + def build_head? include? '--HEAD' end diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index fe4ac3086..7421cabe0 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -16,7 +16,7 @@ class FormulaInstaller @f = ff @tab = tab @show_header = true - @ignore_deps = ARGV.include? '--ignore-dependencies' || ARGV.interactive? + @ignore_deps = ARGV.ignore_deps? || ARGV.interactive? @install_bottle = install_bottle? ff check_install_sanity |