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

Merge pull request #12717 from carlocab/install-pin

Browse Source 
install: respect pins when auto-upgrading
This commit is contained in:
Carlo Cabrera 2022-01-14 01:06:38 +08:00 committed by GitHub
commit db648bcded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/install.rb
View File

@ -125,16 +125,17 @@ module Homebrew
# dependencies. Therefore before performing other checks we need to be # dependencies. Therefore before performing other checks we need to be
# sure --force flag is passed. # sure --force flag is passed.
if f.outdated? if f.outdated?
unless Homebrew::EnvConfig.no_install_upgrade? if !Homebrew::EnvConfig.no_install_upgrade? && !f.pinned?
puts "#{f.name} #{f.linked_version} is already installed but outdated (so it will be upgraded)." puts "#{f.name} #{f.linked_version} is already installed but outdated (so it will be upgraded)."
return true return true
end end
unpin_cmd_if_needed = ("brew unpin #{f.full_name} && " if f.pinned?)
optlinked_version = Keg.for(f.opt_prefix).version optlinked_version = Keg.for(f.opt_prefix).version
onoe <<~EOS onoe <<~EOS
#{f.full_name} #{optlinked_version} is already installed. #{f.full_name} #{optlinked_version} is already installed.
To upgrade to #{f.version}, run: To upgrade to #{f.version}, run:
brew upgrade #{f.full_name} #{unpin_cmd_if_needed}brew upgrade #{f.full_name}
EOS EOS
elsif only_dependencies elsif only_dependencies
return true return true
@ -215,15 +216,16 @@ module Homebrew
elsif f.linked? elsif f.linked?
message = "#{f.name} #{f.linked_version} is already installed" message = "#{f.name} #{f.linked_version} is already installed"
if f.outdated? && !head if f.outdated? && !head
unless Homebrew::EnvConfig.no_install_upgrade? if !Homebrew::EnvConfig.no_install_upgrade? && !f.pinned?
puts "#{message} but outdated (so it will be upgraded)." puts "#{message} but outdated (so it will be upgraded)."
return true return true
end end
unpin_cmd_if_needed = ("brew unpin #{f.full_name} && " if f.pinned?)
onoe <<~EOS onoe <<~EOS
#{message} #{message}
To upgrade to #{f.pkg_version}, run: To upgrade to #{f.pkg_version}, run:
brew upgrade #{f.full_name} #{unpin_cmd_if_needed}brew upgrade #{f.full_name}
EOS EOS
elsif only_dependencies elsif only_dependencies
return true return true