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

Unescape URL before parsing a version from it.

Browse Source
This commit is contained in:
Markus Reiter 2020-12-14 02:08:00 +01:00 committed by Sam Ford
parent 7555556be8
commit 6a125401c7
No known key found for this signature in database
GPG Key ID: 95209E46C7FFDEFE
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/version.rb
View File

@ -318,11 +318,13 @@ class Version
end end
def self.parse(spec, detected_from_url: false) def self.parse(spec, detected_from_url: false)
version = _parse(spec) version = _parse(spec, detected_from_url: detected_from_url)
version.nil? ? NULL : new(version, detected_from_url: detected_from_url) version.nil? ? NULL : new(version, detected_from_url: detected_from_url)
end end
def self._parse(spec) def self._parse(spec, detected_from_url:)
spec = CGI.unescape(spec.to_s) if detected_from_url
spec = Pathname.new(spec) unless spec.is_a? Pathname spec = Pathname.new(spec) unless spec.is_a? Pathname
spec_s = spec.to_s spec_s = spec.to_s
@ -465,7 +467,6 @@ class Version
m = /[-.vV]?((?:\d+\.)+\d+(?:[-_.]?(?i:alpha|beta|pre|rc)\.?\d{,2})?)/.match(spec_s) m = /[-.vV]?((?:\d+\.)+\d+(?:[-_.]?(?i:alpha|beta|pre|rc)\.?\d{,2})?)/.match(spec_s)
return m.captures.first unless m.nil? return m.captures.first unless m.nil?
end end
private_class_method :_parse private_class_method :_parse
def initialize(val, detected_from_url: false) def initialize(val, detected_from_url: false)