diff options
| author | Mike McQuaid | 2015-03-15 16:29:21 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2015-03-15 16:29:40 +0000 |
| commit | 6b58107693b01473c42f9901eb25f52b20b9bd56 (patch) | |
| tree | 5781b10e662ac82cb72618cfe187d690466609c0 /Library | |
| parent | d35f960fe1ebcaa580663df7021c0593a4934744 (diff) | |
| download | brew-6b58107693b01473c42f9901eb25f52b20b9bd56.tar.bz2 | |
bottle_version: add erlang versions style regex.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/bottle_version.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_bottle_versions.rb | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Library/Homebrew/bottle_version.rb b/Library/Homebrew/bottle_version.rb index 9cba7fbfc..8cb447229 100644 --- a/Library/Homebrew/bottle_version.rb +++ b/Library/Homebrew/bottle_version.rb @@ -7,6 +7,10 @@ class BottleVersion < Version m = /-([\d\.]+-x86(_64)?)/.match(stem) return m.captures.first unless m.nil? + # e.g. R14B04 from erlang-r14-R14B04.yosemite.bottle.tar.gz + m = /erlang-r\d+-(R\d+B\d+(-\d)?)/.match(stem) + return m.captures.first unless m.nil? + # e.g. x264-r2197.4.mavericks.bottle.tar.gz # e.g. lz4-r114.mavericks.bottle.tar.gz m = /-(r\d+\.?\d*)/.match(stem) diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb index 05316ec5f..529728c53 100644 --- a/Library/Homebrew/test/test_bottle_versions.rb +++ b/Library/Homebrew/test/test_bottle_versions.rb @@ -56,6 +56,11 @@ class BottleVersionParsingTests < Homebrew::TestCase 'erlang-R16B03-1.mavericks.bottle.2.tar.gz' end + def test_erlang_versions_style + assert_version_detected 'R14B04', + 'erlang-r14-R14B04.yosemite.bottle.tar.gz' + end + def test_libpano_style assert_version_detected '13-2.9.19', 'libpano-13-2.9.19_1.yosemite.bottle.tar.gz' |