diff options
| author | Mike McQuaid | 2016-11-06 17:58:24 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2016-11-06 17:58:24 +0000 |
| commit | b8647778ee2d9ea7bc5a6c3cd7a5812c7d7ea9c8 (patch) | |
| tree | 03c9d0e2b04d42501a66455ce24d34fbfb835583 /Library/Homebrew/dev-cmd/bottle.rb | |
| parent | f46e0032bffffece8e72ffffdb28ac0b1ea7c014 (diff) | |
| parent | ce2b11fd656e85a2cd73f45b4ac25fd34b1599cf (diff) | |
| download | brew-b8647778ee2d9ea7bc5a6c3cd7a5812c7d7ea9c8.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'Library/Homebrew/dev-cmd/bottle.rb')
| -rw-r--r-- | Library/Homebrew/dev-cmd/bottle.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb index b1a3ebb43..7e98f2ebb 100644 --- a/Library/Homebrew/dev-cmd/bottle.rb +++ b/Library/Homebrew/dev-cmd/bottle.rb @@ -251,6 +251,8 @@ module Homebrew relocatable = false if keg_contain?(cellar, keg, ignores) if prefix != prefix_check relocatable = false if keg_contain_absolute_symlink_starting_with?(prefix, keg) + relocatable = false if keg_contain?("#{prefix}/etc", keg, ignores) + relocatable = false if keg_contain?("#{prefix}/var", keg, ignores) end skip_relocation = relocatable && !keg.require_relocation? end |