admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #13791 from Bo98/resource-frozen-version

Browse Source 
resource: determine version before freezing
This commit is contained in:
Bo Anderson 2022-09-01 19:16:56 +01:00 committed by GitHub
commit 08c597d563
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/resource.rb
View File

@ -239,13 +239,13 @@ class Resource
@download_strategy = DownloadStrategyDetector.detect(url, using) @download_strategy = DownloadStrategyDetector.detect(url, using)
@specs.merge!(specs) @specs.merge!(specs)
@downloader = nil @downloader = nil
@version = detect_version(@version)
end end
def version(val = nil) def version(val = nil)
@version ||= begin return @version if val.nil?
version = detect_version(val)
version.null? ? nil : version @version = detect_version(val)
end
end end
def mirror(val) def mirror(val)
@ -266,15 +266,15 @@ class Resource
private private
def detect_version(val) def detect_version(val)
return Version::NULL if val.nil? && url.nil? version = case val
when nil then url.nil? ? Version::NULL : Version.detect(url, **specs)
case val
when nil then Version.detect(url, **specs)
when String then Version.create(val) when String then Version.create(val)
when Version then val when Version then val
else else
raise TypeError, "version '#{val.inspect}' should be a string" raise TypeError, "version '#{val.inspect}' should be a string"
end end
version.null? ? nil : version
end end
# A resource containing a Go package. # A resource containing a Go package.

2
Library/Homebrew/software_spec.rb
View File

@ -354,7 +354,7 @@ class Bottle
@cellar = tag_spec.cellar @cellar = tag_spec.cellar
@rebuild = spec.rebuild @rebuild = spec.rebuild
@resource.version = formula.pkg_version @resource.version = formula.pkg_version.to_s
@resource.checksum = tag_spec.checksum @resource.checksum = tag_spec.checksum
@fetch_tab_retried = false @fetch_tab_retried = false