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

Merge pull request #7034 from MikeMcQuaid/upgrade-no-reinstall-dry-run

Browse Source 
cmd/upgrade, reinstall: don't install on dry-run.
This commit is contained in:
Mike McQuaid 2020-02-14 13:59:57 +00:00 committed by GitHub
commit 23ab620cd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,6 +326,8 @@ module Homebrew
.join(", ") .join(", ")
end end
return if args.dry_run?
reinstallable_broken_dependents.each do |f| reinstallable_broken_dependents.each do |f|
reinstall_formula(f, build_from_source: true) reinstall_formula(f, build_from_source: true)
rescue FormulaInstallationAlreadyAttemptedError rescue FormulaInstallationAlreadyAttemptedError

2
Library/Homebrew/reinstall.rb
View File

@ -8,6 +8,8 @@ module Homebrew
module_function module_function
def reinstall_formula(f, build_from_source: false) def reinstall_formula(f, build_from_source: false)
return if args.dry_run?
if f.opt_prefix.directory? if f.opt_prefix.directory?
keg = Keg.new(f.opt_prefix.resolved_path) keg = Keg.new(f.opt_prefix.resolved_path)
tab = Tab.for_keg(keg) tab = Tab.for_keg(keg)