diff options
| author | Josh Hagins | 2016-10-25 03:41:35 -0400 |
|---|---|---|
| committer | Josh Hagins | 2016-10-25 03:41:37 -0400 |
| commit | 652c5bc865ebda25ead84c5cab04a4688b4e2b9a (patch) | |
| tree | 5ca89f340d76dad1fc494a3267541b5a05a03aef /Library/Homebrew/formula_installer.rb | |
| parent | 79e8cdd3ed8c7f5dee573648d55eb3d3e305de19 (diff) | |
| download | brew-652c5bc865ebda25ead84c5cab04a4688b4e2b9a.tar.bz2 | |
formula_installer: fix regression in #1253
Apparently `cellar :any_skip_relocation` doesn't actually mean we
can skip relocation, at least for text files.
Diffstat (limited to 'Library/Homebrew/formula_installer.rb')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 006db8f8a..c25702059 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -762,12 +762,11 @@ class FormulaInstaller end keg = Keg.new(formula.prefix) + tab = Tab.for_keg(keg) + Tab.clear_cache - unless formula.bottle_specification.skip_relocation? - tab = Tab.for_keg(keg) - Tab.clear_cache - keg.replace_placeholders_with_locations tab.changed_files - end + skip_linkage = formula.bottle_specification.skip_relocation? + keg.replace_placeholders_with_locations tab.changed_files, skip_linkage: skip_linkage Pathname.glob("#{formula.bottle_prefix}/{etc,var}/**/*") do |path| path.extend(InstallRenamed) |