From 93f7a0fa85a7dc61af8633747cff734dfffecb98 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 18 Aug 2012 18:13:01 -0500 Subject: [PATCH] upgrade: filter ARGV when expanding deps This serves the same purpose as similar code in FormulaInstaller, but we duplicate it because we do the dependency expansion in an ad-hoc fashion here. Fixes Homebrew/homebrew#11863. Signed-off-by: Jack Nagel --- Library/Homebrew/cmd/upgrade.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 07558cbecf..1afef1261a 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -29,16 +29,16 @@ module Homebrew extend self end end - 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 - # root dependencies at the head of the list and `uniq` keeps the first - # element it encounters and discards the rest. - outdated.map!{ |f| f.recursive_deps.reject{ |d| d.installed?} << f } + # 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 + # root dependencies at the head of the list and `uniq` keeps the first + # element it encounters and discards the rest. + ARGV.filter_for_dependencies do + outdated.map!{ |f| f.recursive_deps.reject{ |d| d.installed? } << f } outdated.flatten! outdated.uniq! - end + end unless ARGV.ignore_deps? if outdated.length > 1 oh1 "Upgrading #{outdated.length} outdated package#{outdated.length.plural_s}, with result:"