From 8a21bd52d5466504da9025903fcfeaf8c8d34c82 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 18 Aug 2012 18:12:12 -0500 Subject: [PATCH] Add ARGV.ignore_deps? Signed-off-by: Jack Nagel --- Library/Homebrew/cmd/upgrade.rb | 2 +- Library/Homebrew/extend/ARGV.rb | 4 ++++ 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 99954d91e5..07558cbecf 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 4b0c71d034..9c145d1abc 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 fe4ac30864..7421cabe08 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