aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2012-08-18 18:12:12 -0500
committerJack Nagel2012-08-18 19:33:39 -0500
commit8a21bd52d5466504da9025903fcfeaf8c8d34c82 (patch)
treec8fa1d5d54809d6b87a57a0beb9ce47818751fd4
parent3081e697832e8addd5fa7cfc19b4bc8f3922c256 (diff)
downloadbrew-8a21bd52d5466504da9025903fcfeaf8c8d34c82.tar.bz2
Add ARGV.ignore_deps?
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
-rw-r--r--Library/Homebrew/cmd/upgrade.rb2
-rw-r--r--Library/Homebrew/extend/ARGV.rb4
-rw-r--r--Library/Homebrew/formula_installer.rb2
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