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

Improve dash separated version detection.

Browse Source 
* Also with test case.

Closes Homebrew/homebrew#47584.

Signed-off-by: Baptiste Fontaine <batifon@yahoo.fr>
This commit is contained in:
Xiyue Deng 2016-01-01 02:29:41 -08:00 committed by Baptiste Fontaine
parent c6f45a9e06
commit e1dfafa54c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/test/test_versions.rb
View File

@ -365,4 +365,8 @@ class VersionParsingTests < Homebrew::TestCase
def test_waf_version def test_waf_version
assert_version_detected "1.8.12", "https://waf.io/waf-1.8.12" assert_version_detected "1.8.12", "https://waf.io/waf-1.8.12"
end end
def test_dash_separated_version
assert_version_detected "6-20151227", "ftp://gcc.gnu.org/pub/gcc/snapshots/6-20151227/gcc-6-20151227.tar.bz2"
end
end end

2
Library/Homebrew/version.rb
View File

@ -312,7 +312,7 @@ class Version
return m.captures.first unless m.nil? return m.captures.first unless m.nil?
# e.g. lame-398-1 # e.g. lame-398-1
m = /-((?:\d)+-\d)/.match(stem) m = /-((?:\d)+-\d+)/.match(stem)
return m.captures.first unless m.nil? return m.captures.first unless m.nil?
# e.g. foobar-4.5.1 # e.g. foobar-4.5.1