From e1dfafa54ccf95d6abe5de28da53ea1e6406f567 Mon Sep 17 00:00:00 2001 From: Xiyue Deng Date: Fri, 1 Jan 2016 02:29:41 -0800 Subject: Improve dash separated version detection. * Also with test case. Closes Homebrew/homebrew#47584. Signed-off-by: Baptiste Fontaine --- Library/Homebrew/test/test_versions.rb | 4 ++++ Library/Homebrew/version.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'Library') diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb index 5bc9aded8..87dd28339 100644 --- a/Library/Homebrew/test/test_versions.rb +++ b/Library/Homebrew/test/test_versions.rb @@ -365,4 +365,8 @@ class VersionParsingTests < Homebrew::TestCase def test_waf_version assert_version_detected "1.8.12", "https://waf.io/waf-1.8.12" 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 diff --git a/Library/Homebrew/version.rb b/Library/Homebrew/version.rb index 70e7198b0..6345676c3 100644 --- a/Library/Homebrew/version.rb +++ b/Library/Homebrew/version.rb @@ -312,7 +312,7 @@ class Version return m.captures.first unless m.nil? # e.g. lame-398-1 - m = /-((?:\d)+-\d)/.match(stem) + m = /-((?:\d)+-\d+)/.match(stem) return m.captures.first unless m.nil? # e.g. foobar-4.5.1 -- cgit v1.2.3