From f70a2c67da7dfb4abf7c6ae0044abb248d518781 Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Thu, 1 Nov 2018 09:28:31 -0700 Subject: [PATCH] pull --bottle: Fix bug in any_bottle_tag Utils::Bottles.tag is a symbol, whereas bottle_tags is an array of strings. --- Library/Homebrew/dev-cmd/pull.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/pull.rb b/Library/Homebrew/dev-cmd/pull.rb index b496f3aa19..2554d44e65 100644 --- a/Library/Homebrew/dev-cmd/pull.rb +++ b/Library/Homebrew/dev-cmd/pull.rb @@ -581,7 +581,7 @@ module Homebrew end def any_bottle_tag - tag = Utils::Bottles.tag + tag = Utils::Bottles.tag.to_s # Prefer native bottles as a convenience for download caching bottle_tags.include?(tag) ? tag : bottle_tags.first end @@ -640,7 +640,7 @@ module Homebrew opoo "Cannot publish bottle: Failed reading info for formula #{f.full_name}" next end - bottle_info = jinfo.bottle_info(jinfo.bottle_tags.first) + bottle_info = jinfo.bottle_info_any unless bottle_info opoo "No bottle defined in formula #{f.full_name}" next