From 2e5011c6bbb82f059949ea4a511bf15f5c43aea8 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 26 Feb 2015 19:13:10 +0000 Subject: bottle: fixup keg_contains method. --- Library/Homebrew/cmd/bottle.rb | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index 597e2fe9b..dcbc0e2ce 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -33,20 +33,22 @@ BOTTLE_ERB = <<-EOS EOS module Homebrew - def print_filename string, filename - unless @put_string_exists_header - opoo "String '#{string}' still exists in these files:" - @put_string_exists_header = true - end + def keg_contains string, keg, ignores + @put_string_exists_header, @put_filenames = nil + + def print_filename string, filename + unless @put_string_exists_header + opoo "String '#{string}' still exists in these files:" + @put_string_exists_header = true + end - @put_filenames ||= [] - unless @put_filenames.include? filename - puts "#{Tty.red}#{filename}#{Tty.reset}" - @put_filenames << filename + @put_filenames ||= [] + unless @put_filenames.include? filename + puts "#{Tty.red}#{filename}#{Tty.reset}" + @put_filenames << filename + end end - end - def keg_contains string, keg, ignores result = false keg.each_unique_file_matching(string) do |file| -- cgit v1.2.3