From 82051a56ec655918f377f0ca85f807d82a3341b6 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 23 Jan 2013 00:26:29 -0600 Subject: [PATCH] upgrade: offload dependency expansion to FormulaInstaller Now that FormulaInstaller does dependency expansion the _right_ way, avoid duplicating the logic in upgrade. Instead, offload it to the installer, which will generate an exception in check_install_sanity that we can safely ignore when formulae in the outdated list are upgraded as part of the dependency tree of another outdated formula. --- Library/Homebrew/cmd/upgrade.rb | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index f80a218eb8..c63a535fe2 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -32,17 +32,6 @@ module Homebrew extend self exit 1 if outdated.empty? end - # 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 unless ARGV.ignore_deps? - if outdated.length > 1 oh1 "Upgrading #{outdated.length} outdated package#{outdated.length.plural_s}, with result:" puts outdated.map{ |f| "#{f.name} #{f.version}" } * ", "