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

Use FormulaInstaller#fetch before #prelude.

Browse Source
This commit is contained in:
Mike McQuaid 2020-05-03 14:54:31 +01:00
parent 48918bb5e3
commit 08a9f0e1c0
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cask/installer.rb
View File

@ -368,8 +368,8 @@ module Cask
fi.installed_on_request = false fi.installed_on_request = false
fi.show_header = true fi.show_header = true
fi.verbose = verbose? fi.verbose = verbose?
fi.prelude
fi.fetch fi.fetch
fi.prelude
fi.install fi.install
fi.finish fi.finish
end end

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

@ -325,8 +325,8 @@ module Homebrew
fi.build_bottle = args.build_bottle? fi.build_bottle = args.build_bottle?
fi.interactive = args.interactive? fi.interactive = args.interactive?
fi.git = args.git? fi.git = args.git?
fi.prelude
fi.fetch fi.fetch
fi.prelude
fi.install fi.install
fi.finish fi.finish
rescue FormulaInstallationAlreadyAttemptedError rescue FormulaInstallationAlreadyAttemptedError

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

@ -183,7 +183,6 @@ module Homebrew
fi.installed_as_dependency = tab.installed_as_dependency fi.installed_as_dependency = tab.installed_as_dependency
fi.installed_on_request ||= tab.installed_on_request fi.installed_on_request ||= tab.installed_on_request
end end
fi.prelude
upgrade_version = if f.optlinked? upgrade_version = if f.optlinked?
"#{Keg.new(f.opt_prefix).version} -> #{f.pkg_version}" "#{Keg.new(f.opt_prefix).version} -> #{f.pkg_version}"
@ -193,6 +192,7 @@ module Homebrew
oh1 "Upgrading #{Formatter.identifier(f.full_specified_name)} #{upgrade_version} #{fi.options.to_a.join(" ")}" oh1 "Upgrading #{Formatter.identifier(f.full_specified_name)} #{upgrade_version} #{fi.options.to_a.join(" ")}"
fi.fetch fi.fetch
fi.prelude
# 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

2
Library/Homebrew/reinstall.rb
View File

@ -35,8 +35,8 @@ module Homebrew
fi.installed_as_dependency = tab.installed_as_dependency fi.installed_as_dependency = tab.installed_as_dependency
fi.installed_on_request = tab.installed_on_request fi.installed_on_request = tab.installed_on_request
end end
fi.prelude
fi.fetch fi.fetch
fi.prelude
oh1 "Reinstalling #{Formatter.identifier(f.full_name)} #{options.to_a.join " "}" oh1 "Reinstalling #{Formatter.identifier(f.full_name)} #{options.to_a.join " "}"

2
Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
View File

@ -176,8 +176,8 @@ RSpec.shared_context "integration test" do
setup_test_formula(name, content) setup_test_formula(name, content)
fi = FormulaInstaller.new(Formula[name]) fi = FormulaInstaller.new(Formula[name])
fi.build_bottle = build_bottle fi.build_bottle = build_bottle
fi.prelude
fi.fetch fi.fetch
fi.prelude
fi.install fi.install
fi.finish fi.finish
end end