Simplified check resources' condition for Formulae
This commit is contained in:
parent
6ec81ac31c
commit
5beb7c1772
@ -284,28 +284,23 @@ module Homebrew
|
|||||||
end
|
end
|
||||||
|
|
||||||
# Check current and latest resources (if "--resources" flag is given)
|
# Check current and latest resources (if "--resources" flag is given)
|
||||||
if check_resources
|
# Only check current and latest versions if we have resources to check against
|
||||||
|
if check_resources && formula_or_cask.resources.present?
|
||||||
|
current_resources = formula_or_cask.resources.map do |resource|
|
||||||
|
{ name: resource.name, version: resource.version, livecheckable: resource.livecheckable? }
|
||||||
|
end
|
||||||
|
|
||||||
has_resources = formula_or_cask.resources.any?
|
resource_version_info = resource_version(
|
||||||
|
formula_or_cask,
|
||||||
|
json: json,
|
||||||
|
full_name: use_full_name,
|
||||||
|
verbose: verbose,
|
||||||
|
debug: debug,
|
||||||
|
)
|
||||||
|
|
||||||
# Only check current and latest versions if we have resources to check against
|
latest_resources = resource_version_info.map do |resource|
|
||||||
if has_resources
|
{ name: resource[:resource], version: resource[:version][:latest] }
|
||||||
|
|
||||||
current_resources = formula_or_cask.resources.map do |resource|
|
|
||||||
{ name: resource.name, version: resource.version, livecheckable: resource.livecheckable? }
|
|
||||||
end
|
|
||||||
|
|
||||||
resource_version_info = resource_version(
|
|
||||||
formula_or_cask,
|
|
||||||
json: json,
|
|
||||||
full_name: use_full_name,
|
|
||||||
verbose: verbose,
|
|
||||||
debug: debug,
|
|
||||||
)
|
|
||||||
|
|
||||||
latest_resources = resource_version_info.map do |resource|
|
|
||||||
{ name: resource[:resource], version: resource[:version][:latest] }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if latest.blank?
|
if latest.blank?
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user