aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dev-cmd
diff options
context:
space:
mode:
authorMike McQuaid2016-11-06 08:15:13 -0500
committerGitHub2016-11-06 08:15:13 -0500
commitbc67414b9ad9eb5dac64a9c8344b647beda99e14 (patch)
tree759873ad7ea9c141da1d246d4a2191599063fdf8 /Library/Homebrew/dev-cmd
parent654fa2513baba392bdb244dc22cf6cd13d920f0c (diff)
parentc5bd5c4aa7f0595c91431407ff5bda4b1938afc3 (diff)
downloadbrew-bc67414b9ad9eb5dac64a9c8344b647beda99e14.tar.bz2
Merge pull request #1449 from ilovezfs/bottle-improve-relocatability-check
bottle: improve relocatability check
Diffstat (limited to 'Library/Homebrew/dev-cmd')
-rw-r--r--Library/Homebrew/dev-cmd/bottle.rb2
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