diff options
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/bottle.rb | 3 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/doctor.rb | 7 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/pull.rb | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index 83f1147c5..574c3c69d 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -36,7 +36,8 @@ MAXIMUM_STRING_MATCHES = 100 module Homebrew def keg_contains(string, keg, ignores) - @put_string_exists_header, @put_filenames = nil + @put_string_exists_header = nil + @put_filenames = nil def print_filename(string, filename) unless @put_string_exists_header diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index f2de84d4d..423118b12 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -1298,13 +1298,14 @@ module Homebrew first_warning = true methods.each do |method| - begin - out = checks.send(method) - rescue NoMethodError + unless checks.respond_to?(method) Homebrew.failed = true puts "No check available by the name: #{method}" next end + + out = checks.send(method) + unless out.nil? || out.empty? if first_warning $stderr.puts <<-EOS.undent diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb index 1454f9938..959724002 100644 --- a/Library/Homebrew/cmd/pull.rb +++ b/Library/Homebrew/cmd/pull.rb @@ -59,7 +59,7 @@ module Homebrew url = "https://github.com/Homebrew/homebrew/pull/#{arg}" tap = CoreFormulaRepository.instance elsif (testing_match = arg.match %r{brew.sh/job/Homebrew.*Testing/(\d+)/}) - _, testing_job = *testing_match + testing_job = testing_match[1] url = "https://github.com/Homebrew/homebrew/compare/master...BrewTestBot:testing-#{testing_job}" tap = CoreFormulaRepository.instance odie "Testing URLs require `--bottle`!" unless ARGV.include?("--bottle") |
