admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

upgrade: offload dependency expansion to FormulaInstaller

Browse Source 
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.
This commit is contained in:
Jack Nagel 2013-01-23 00:26:29 -06:00
parent 18836d93d8
commit 82051a56ec
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/cmd/upgrade.rb
View File

@ -32,17 +32,6 @@ module Homebrew extend self
exit 1 if outdated.empty? exit 1 if outdated.empty?
end 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 if outdated.length > 1
oh1 "Upgrading #{outdated.length} outdated package#{outdated.length.plural_s}, with result:" oh1 "Upgrading #{outdated.length} outdated package#{outdated.length.plural_s}, with result:"
puts outdated.map{ |f| "#{f.name} #{f.version}" } * ", " puts outdated.map{ |f| "#{f.name} #{f.version}" } * ", "