admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #8178 from Rylan12/bottle-fix-args

Browse Source 
bottle: fix args
This commit is contained in:
Michka Popoff 2020-08-01 21:23:00 +02:00 committed by GitHub
commit 5a7c423e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -176,10 +176,10 @@ module Homebrew
end end
end end
keg_contain_absolute_symlink_starting_with?(string, keg) || result keg_contain_absolute_symlink_starting_with?(string, keg, args: args) || result
end end
def keg_contain_absolute_symlink_starting_with?(string, keg) def keg_contain_absolute_symlink_starting_with?(string, keg, args:)
absolute_symlinks_start_with_string = [] absolute_symlinks_start_with_string = []
keg.find do |pn| keg.find do |pn|
next unless pn.symlink? && (link = pn.readlink).absolute? next unless pn.symlink? && (link = pn.readlink).absolute?
@ -331,7 +331,7 @@ module Homebrew
relocatable = false if keg_contain?(repository, keg, ignores, args: args) relocatable = false if keg_contain?(repository, keg, ignores, args: args)
relocatable = false if keg_contain?(cellar, keg, ignores, formula_and_runtime_deps_names, args: args) relocatable = false if keg_contain?(cellar, keg, ignores, formula_and_runtime_deps_names, args: args)
if prefix != prefix_check if prefix != prefix_check
relocatable = false if keg_contain_absolute_symlink_starting_with?(prefix, keg) relocatable = false if keg_contain_absolute_symlink_starting_with?(prefix, keg, args: args)
relocatable = false if keg_contain?("#{prefix}/etc", keg, ignores, args: args) relocatable = false if keg_contain?("#{prefix}/etc", keg, ignores, args: args)
relocatable = false if keg_contain?("#{prefix}/var", keg, ignores, args: args) relocatable = false if keg_contain?("#{prefix}/var", keg, ignores, args: args)
relocatable = false if keg_contain?("#{prefix}/share/vim", keg, ignores, args: args) relocatable = false if keg_contain?("#{prefix}/share/vim", keg, ignores, args: args)