keg_relocate: fix ordering of replacements

2016-11-01 11:55:03 -04:00 · 2016-11-01 11:55:03 -04:00 · d60020f1a9
commit d60020f1a9
parent 8d5df2ea87
1 changed files with 8 additions and 1 deletions
--- a/Library/Homebrew/keg_relocate.rb
+++ b/Library/Homebrew/keg_relocate.rb
@ -66,7 +66,14 @@ class Keg
        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)

      next unless changed