From 54a1f2005ae23dda92f9ce9ad8b842f4ef7f0597 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Mon, 10 Jul 2023 14:50:53 +0100 Subject: [PATCH] livecheck: fix implicit no-api handling --- Library/Homebrew/livecheck/livecheck.rb | 10 ++++++---- Library/Homebrew/livecheck/strategy/extract_plist.rb | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb index acef02e986..1d079978ae 100644 --- a/Library/Homebrew/livecheck/livecheck.rb +++ b/Library/Homebrew/livecheck/livecheck.rb @@ -113,10 +113,12 @@ module Homebrew return [nil, references] if livecheck_formula.blank? && livecheck_cask.blank? # Load the referenced formula or cask - referenced_formula_or_cask = if livecheck_formula - Formulary.factory(livecheck_formula) - elsif livecheck_cask - Cask::CaskLoader.load(livecheck_cask) + referenced_formula_or_cask = Homebrew.with_no_api_env do + if livecheck_formula + Formulary.factory(livecheck_formula) + elsif livecheck_cask + Cask::CaskLoader.load(livecheck_cask) + end end # Error if a `livecheck` block references a formula/cask that was already diff --git a/Library/Homebrew/livecheck/strategy/extract_plist.rb b/Library/Homebrew/livecheck/strategy/extract_plist.rb index 21dc2c34a8..96ab1f19a0 100644 --- a/Library/Homebrew/livecheck/strategy/extract_plist.rb +++ b/Library/Homebrew/livecheck/strategy/extract_plist.rb @@ -104,7 +104,7 @@ module Homebrew unversioned_cask_checker = if url.present? && url != cask.url.to_s # Create a copy of the `cask` that uses the `livecheck` block URL - cask_copy = Cask::CaskLoader.load(cask.full_name) + cask_copy = Cask::CaskLoader.load(cask.sourcefile_path) cask_copy.allow_reassignment = true cask_copy.url { url } UnversionedCaskChecker.new(cask_copy)