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

upgrade: use Formula#full_name

Browse Source
This commit is contained in:
Xu Cheng 2015-05-27 21:23:45 +08:00
parent 019bdb25f1
commit 082ce482fc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,9 +21,9 @@ module Homebrew
(ARGV.resolved_formulae - outdated).each do |f| (ARGV.resolved_formulae - outdated).each do |f|
if f.rack.directory? if f.rack.directory?
version = f.rack.subdirs.map { |d| Keg.new(d).version }.max version = f.rack.subdirs.map { |d| Keg.new(d).version }.max
onoe "#{f.name} #{version} already installed" onoe "#{f.full_name} #{version} already installed"
else else
onoe "#{f.name} not installed" onoe "#{f.full_name} not installed"
end end
end end
exit 1 if outdated.empty? exit 1 if outdated.empty?
@ -41,14 +41,14 @@ module Homebrew
unless outdated.empty? unless outdated.empty?
oh1 "Upgrading #{outdated.length} outdated package#{plural(outdated.length)}, with result:" oh1 "Upgrading #{outdated.length} outdated package#{plural(outdated.length)}, with result:"
puts outdated.map{ |f| "#{f.name} #{f.pkg_version}" } * ", " puts outdated.map{ |f| "#{f.full_name} #{f.pkg_version}" } * ", "
else else
oh1 "No packages to upgrade" oh1 "No packages to upgrade"
end end
unless upgrade_pinned? || pinned.empty? unless upgrade_pinned? || pinned.empty?
oh1 "Not upgrading #{pinned.length} pinned package#{plural(pinned.length)}:" oh1 "Not upgrading #{pinned.length} pinned package#{plural(pinned.length)}:"
puts pinned.map{ |f| "#{f.name} #{f.pkg_version}" } * ", " puts pinned.map{ |f| "#{f.full_name} #{f.pkg_version}" } * ", "
end end
outdated.each { |f| upgrade_formula(f) } outdated.each { |f| upgrade_formula(f) }
@ -71,7 +71,7 @@ module Homebrew
fi.debug = ARGV.debug? fi.debug = ARGV.debug?
fi.prelude fi.prelude
oh1 "Upgrading #{f.name}" oh1 "Upgrading #{f.full_name}"
# first we unlink the currently active keg for this formula otherwise it is # first we unlink the currently active keg for this formula otherwise it is
# possible for the existing build to interfere with the build we are about to # possible for the existing build to interfere with the build we are about to