diff options
| author | Mike McQuaid | 2012-12-15 19:06:03 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2012-12-16 14:35:41 +0000 |
| commit | e4b5b88bd978df17f5dd79da675a8896647d273f (patch) | |
| tree | c43646d03ff7e505158582229ba147e6414dca3f | |
| parent | 4085c0b476fdf10b33fe368eb263b74e4ff57b43 (diff) | |
| download | homebrew-e4b5b88bd978df17f5dd79da675a8896647d273f.tar.bz2 | |
Add another Erlang version format.
| -rw-r--r-- | Library/Homebrew/test/test_versions.rb | 8 | ||||
| -rw-r--r-- | Library/Homebrew/version.rb | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb index e1566b50e..f5a7ac8f8 100644 --- a/Library/Homebrew/test/test_versions.rb +++ b/Library/Homebrew/test/test_versions.rb @@ -97,6 +97,10 @@ class VersionParsingTests < Test::Unit::TestCase assert_version_detected 'R15B01', 'https://github.com/erlang/otp/tarball/OTP_R15B01' end + def test_yet_another_erlang_version_style + assert_version_detected 'R15B03-1', 'https://github.com/erlang/otp/tarball/OTP_R15B03-1' + end + def test_p7zip_version_style assert_version_detected '9.04', 'http://kent.dl.sourceforge.net/sourceforge/p7zip/p7zip_9.04_src_all.tar.bz2' @@ -211,6 +215,10 @@ class VersionParsingTests < Test::Unit::TestCase assert_version_detected 'R15B01', 'https://downloads.sf.net/project/machomebrew/Bottles/erlang-R15B01.mountainlion.bottle.tar.gz' end + def test_yet_another_erlang_bottle_style + assert_version_detected 'R15B03-1', 'https://downloads.sf.net/project/machomebrew/Bottles/erlang-R15B03-1.mountainlion.bottle.tar.gz' + end + def test_old_bottle_style assert_version_detected '4.7.3', 'https://downloads.sf.net/project/machomebrew/Bottles/qt-4.7.3-bottle.tar.gz' end diff --git a/Library/Homebrew/version.rb b/Library/Homebrew/version.rb index be1ee63c2..75233c16c 100644 --- a/Library/Homebrew/version.rb +++ b/Library/Homebrew/version.rb @@ -128,7 +128,7 @@ class Version return m.captures.first unless m.nil? # e.g. https://github.com/erlang/otp/tarball/OTP_R15B01 (erlang style) - m = /[-_](R\d+[AB]\d*)/.match(spec.to_s) + m = /[-_](R\d+[AB]\d*(-\d+)?)/.match(spec.to_s) return m.captures.first unless m.nil? # e.g. boost_1_39_0 |