diff options
| author | Mike McQuaid | 2015-02-26 19:13:10 +0000 | 
|---|---|---|
| committer | Mike McQuaid | 2015-02-26 19:13:10 +0000 | 
| commit | 2e5011c6bbb82f059949ea4a511bf15f5c43aea8 (patch) | |
| tree | 0e64b4aa41cca567a821da2502c9eaf46574e09f | |
| parent | d94e7fa5e788f037b1d4770523708cfb5d0f38d1 (diff) | |
| download | homebrew-2e5011c6bbb82f059949ea4a511bf15f5c43aea8.tar.bz2 | |
bottle: fixup keg_contains method.
| -rw-r--r-- | Library/Homebrew/cmd/bottle.rb | 24 | 
1 files changed, 13 insertions, 11 deletions
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|  | 
