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

keg_relocate: split relocate_install_names and relocate_text_files

Browse Source 
For bottle with `:any_skip_relocation`, relocating text files is
required.
This commit is contained in:
Xu Cheng 2015-09-11 18:55:46 +08:00
parent 7ce0a2dedb
commit d911b5689a
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,8 @@ module Homebrew
begin begin
keg.relocate_install_names prefix, Keg::PREFIX_PLACEHOLDER, keg.relocate_install_names prefix, Keg::PREFIX_PLACEHOLDER,
cellar, Keg::CELLAR_PLACEHOLDER, :keg_only => f.keg_only? cellar, Keg::CELLAR_PLACEHOLDER, :keg_only => f.keg_only?
keg.relocate_text_files prefix, Keg::PREFIX_PLACEHOLDER,
cellar, Keg::CELLAR_PLACEHOLDER
keg.delete_pyc_files! keg.delete_pyc_files!
cd cellar do cd cellar do

2
Library/Homebrew/formula_installer.rb
View File

@ -708,6 +708,8 @@ class FormulaInstaller
keg.relocate_install_names Keg::PREFIX_PLACEHOLDER, HOMEBREW_PREFIX.to_s, keg.relocate_install_names Keg::PREFIX_PLACEHOLDER, HOMEBREW_PREFIX.to_s,
Keg::CELLAR_PLACEHOLDER, HOMEBREW_CELLAR.to_s, :keg_only => formula.keg_only? Keg::CELLAR_PLACEHOLDER, HOMEBREW_CELLAR.to_s, :keg_only => formula.keg_only?
end end
keg.relocate_text_files Keg::PREFIX_PLACEHOLDER, HOMEBREW_PREFIX.to_s,
Keg::CELLAR_PLACEHOLDER, HOMEBREW_CELLAR.to_s
Pathname.glob("#{formula.bottle_prefix}/{etc,var}/**/*") do |path| Pathname.glob("#{formula.bottle_prefix}/{etc,var}/**/*") do |path|
path.extend(InstallRenamed) path.extend(InstallRenamed)

2
Library/Homebrew/keg_relocate.rb
View File

@ -46,7 +46,9 @@ class Keg
end end
end end
end end
end
def relocate_text_files(old_prefix, new_prefix, old_cellar, new_cellar)
files = text_files | libtool_files files = text_files | libtool_files
files.group_by { |f| f.stat.ino }.each_value do |first, *rest| files.group_by { |f| f.stat.ino }.each_value do |first, *rest|