From f9589429d63f52445d136eb4480260271e6d6fd0 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 29 Apr 2021 16:00:22 +0100 Subject: [PATCH] dev-cmd/bottle: handle empty collector tags. Fixes https://github.com/Homebrew/homebrew-core/runs/2467738434?check_suite_focus=true#step:6:458 --- Library/Homebrew/dev-cmd/bottle.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb index b317e19715..11477d13e6 100644 --- a/Library/Homebrew/dev-cmd/bottle.rb +++ b/Library/Homebrew/dev-cmd/bottle.rb @@ -654,9 +654,15 @@ module Homebrew bottle.rebuild != old_bottle_spec.rebuild && bottle.root_url == old_bottle_spec.root_url bottle.collector.keys.all? do |tag| - next false if bottle.collector[tag][:cellar] != old_bottle_spec.collector[tag][:cellar] + bottle_collector_tag = bottle.collector[tag] + next false if bottle_collector_tag.blank? - bottle.collector[tag][:checksum].hexdigest == old_bottle_spec.collector[tag][:checksum].hexdigest + old_bottle_spec_collector_tag = old_bottle_spec.collector[tag][tag] + next false if old_bottle_spec_collector_tag.blank? + + next false if bottle_collector_tag[:cellar] != old_bottle_spec_collector_tag[:cellar] + + bottle_collector_tag[:checksum].hexdigest == old_bottle_spec_collector_tag[:checksum].hexdigest end end