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

CoreFormulaRepository: move require statements to the top

Browse Source 
This commit will help to mitigate bug Homebrew/homebrew#42553 on certain old Homebrew installations
(e.g. `osx_image: xcode6.4` on Travis CI) for future core/formula
separation.

On that particular Homebrew installations, `formulary.rb` will be loaded after
`git pull` is finished during `brew update`, which will then load `core_formular_repository.rb`.

By introducing `require "tap_migrations"` and `require "formula_renames"` at the top of
`core_formular_repository.rb`, we could use `tap_migrations.rb` as a
vector to preform certain hack for future core/formula separation.
This commit is contained in:
Xu Cheng 2016-03-04 19:21:53 +08:00
parent 59536356b6
commit a2d0d88bf1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/core_formula_repository.rb
View File

@ -1,4 +1,6 @@
require "tap" require "tap"
require "tap_migrations"
require "formula_renames"
# A specialized {Tap} class to mimic the core formula file system, which shares many # A specialized {Tap} class to mimic the core formula file system, which shares many
# similarities with normal {Tap}. # similarities with normal {Tap}.
@ -64,13 +66,11 @@ class CoreFormulaRepository < Tap
# @private # @private
def formula_renames def formula_renames
require "formula_renames"
FORMULA_RENAMES FORMULA_RENAMES
end end
# @private # @private
def tap_migrations def tap_migrations
require "tap_migrations"
TAP_MIGRATIONS TAP_MIGRATIONS
end end