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

cmd/upgrade: fix Rubocop warnings.

Browse Source
This commit is contained in:
Mike McQuaid 2016-09-10 10:24:57 +01:00
parent cc526601cf
commit 2c5beb0eff
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ module Homebrew
end end
(ARGV.resolved_formulae - outdated).each do |f| (ARGV.resolved_formulae - outdated).each do |f|
versions = f.installed_kegs.map { |keg| keg.version } versions = f.installed_kegs.map(&:version)
if versions.empty? if versions.empty?
onoe "#{f.full_name} not installed" onoe "#{f.full_name} not installed"
else else
@ -51,11 +51,11 @@ module Homebrew
outdated -= pinned outdated -= pinned
end end
unless outdated.empty? if outdated.empty?
oh1 "No packages to upgrade"
else
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.full_name} #{f.pkg_version}" } * ", " puts outdated.map { |f| "#{f.full_name} #{f.pkg_version}" } * ", "
else
oh1 "No packages to upgrade"
end end
unless upgrade_pinned? || pinned.empty? unless upgrade_pinned? || pinned.empty?
@ -116,6 +116,10 @@ module Homebrew
ofail e ofail e
ensure ensure
# restore previous installation state if build failed # restore previous installation state if build failed
outdated_keg.link if outdated_keg && !f.installed? rescue nil begin
outdated_keg.link if outdated_keg && !f.installed?
rescue
nil
end
end end
end end