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

keg_relocate: fix ordering of replacements

Browse Source
This commit is contained in:
Josh Hagins 2016-11-01 11:55:03 -04:00
parent 8d5df2ea87
commit d60020f1a9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/keg_relocate.rb
View File

@ -66,7 +66,14 @@ class Keg
relocation.old_repository => relocation.new_repository, relocation.old_repository => relocation.new_repository,
} }
regexp = Regexp.union(replacements.keys) # Order matters here since `HOMEBREW_CELLAR` and `HOMEBREW_REPOSITORY` are
# children of `HOMEBREW_PREFIX` by default.
regexp = Regexp.union(
relocation.old_cellar,
relocation.old_repository,
relocation.old_prefix
)
changed = s.gsub!(regexp, replacements) changed = s.gsub!(regexp, replacements)
next unless changed next unless changed