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

Make method names inquisitive

Browse Source 
Closes #592.

Signed-off-by: Tim D. Smith <git@tim-smith.us>
This commit is contained in:
Tim D. Smith 2016-07-27 16:19:40 -07:00
parent 9c0a2ac933
commit c4deed68bd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/cmd/bottle.rb
View File

@ -35,7 +35,7 @@ EOS
MAXIMUM_STRING_MATCHES = 100 MAXIMUM_STRING_MATCHES = 100
module Homebrew module Homebrew
def keg_contains(string, keg, ignores) def keg_contain?(string, keg, ignores)
@put_string_exists_header, @put_filenames = nil @put_string_exists_header, @put_filenames = nil
def print_filename(string, filename) def print_filename(string, filename)
@ -95,10 +95,10 @@ module Homebrew
end end
end end
keg_contains_absolute_symlink_starting_with?(string, keg) || result keg_contain_absolute_symlink_starting_with?(string, keg) || result
end end
def keg_contains_absolute_symlink_starting_with?(string, keg) def keg_contain_absolute_symlink_starting_with?(string, keg)
absolute_symlinks_start_with_string = [] absolute_symlinks_start_with_string = []
keg.find do |pn| keg.find do |pn|
if pn.symlink? && (link = pn.readlink).absolute? if pn.symlink? && (link = pn.readlink).absolute?
@ -237,10 +237,10 @@ module Homebrew
if ARGV.include? "--skip-relocation" if ARGV.include? "--skip-relocation"
skip_relocation = true skip_relocation = true
else else
relocatable = false if keg_contains(prefix_check, keg, ignores) relocatable = false if keg_contain?(prefix_check, keg, ignores)
relocatable = false if keg_contains(cellar, keg, ignores) relocatable = false if keg_contain?(cellar, keg, ignores)
if prefix != prefix_check if prefix != prefix_check
relocatable = false if keg_contains_absolute_symlink_starting_with?(prefix, keg) relocatable = false if keg_contain_absolute_symlink_starting_with?(prefix, keg)
end end
skip_relocation = relocatable && !keg.require_install_name_tool? skip_relocation = relocatable && !keg.require_install_name_tool?
end end