diff options
| author | Mike McQuaid | 2016-09-19 08:14:44 +0100 |
|---|---|---|
| committer | GitHub | 2016-09-19 08:14:44 +0100 |
| commit | e4fb2ce3bdc58719cfacb18d56f2b201112fbf63 (patch) | |
| tree | 0a556dcca261be0ff7f814e3a4f8f7392203fa30 /Library/Homebrew/dev-cmd | |
| parent | 8e9a9b6428e5d6fea6d9808ab2c6101f598e0eb7 (diff) | |
| parent | 997ccb044d21fccb1a95ef4eefad0fa892289e02 (diff) | |
| download | brew-e4fb2ce3bdc58719cfacb18d56f2b201112fbf63.tar.bz2 | |
Merge pull request #1015 from MikeMcQuaid/relocate-repository
Relocate HOMEBREW_REPOSITORY when necessary.
Diffstat (limited to 'Library/Homebrew/dev-cmd')
| -rw-r--r-- | Library/Homebrew/dev-cmd/bottle.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb index 1a7da8eb9..0c13d5028 100644 --- a/Library/Homebrew/dev-cmd/bottle.rb +++ b/Library/Homebrew/dev-cmd/bottle.rb @@ -177,6 +177,7 @@ module Homebrew tar_path = Pathname.pwd/tar_filename prefix = HOMEBREW_PREFIX.to_s + repository = HOMEBREW_REPOSITORY.to_s cellar = HOMEBREW_CELLAR.to_s ohai "Bottling #{filename}..." @@ -193,7 +194,8 @@ module Homebrew keg.relocate_dynamic_linkage prefix, Keg::PREFIX_PLACEHOLDER, cellar, Keg::CELLAR_PLACEHOLDER keg.relocate_text_files prefix, Keg::PREFIX_PLACEHOLDER, - cellar, Keg::CELLAR_PLACEHOLDER + cellar, Keg::CELLAR_PLACEHOLDER, + repository, Keg::REPOSITORY_PLACEHOLDER end keg.delete_pyc_files! @@ -248,6 +250,7 @@ module Homebrew skip_relocation = true else relocatable = false if keg_contain?(prefix_check, keg, ignores) + relocatable = false if keg_contain?(repository, keg, ignores) relocatable = false if keg_contain?(cellar, keg, ignores) if prefix != prefix_check relocatable = false if keg_contain_absolute_symlink_starting_with?(prefix, keg) @@ -265,7 +268,8 @@ module Homebrew keg.relocate_dynamic_linkage Keg::PREFIX_PLACEHOLDER, prefix, Keg::CELLAR_PLACEHOLDER, cellar keg.relocate_text_files Keg::PREFIX_PLACEHOLDER, prefix, - Keg::CELLAR_PLACEHOLDER, cellar + Keg::CELLAR_PLACEHOLDER, cellar, + Keg::REPOSITORY_PLACEHOLDER, repository end end end |