diff options
| -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 a6e488b4f..25f15b9fc 100644 --- a/Library/Homebrew/bottle_version.rb +++ b/Library/Homebrew/bottle_version.rb @@ -7,6 +7,10 @@ class BottleVersion < Version m = /[a-z]{3}\d-(\d{1}-\d{8})/.match(stem) return m.captures.first unless m.nil? + # e.g. 1.0.2a-1 from openssl-1.0.2a-1.yosemite.bottle.1.tar.gz + m = /-(\d+\.\d+(\.\d+)+[a-z]-\d+)/.match(stem) + return m.captures.first unless m.nil? + # e.g. perforce-2013.1.610569-x86_64.mountain_lion.bottle.tar.gz m = /-([\d\.]+-x86(_64)?)/.match(stem) return m.captures.first unless m.nil? diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb index c6ab855ca..73edd8e19 100644 --- a/Library/Homebrew/test/test_bottle_versions.rb +++ b/Library/Homebrew/test/test_bottle_versions.rb @@ -80,4 +80,9 @@ class BottleVersionParsingTests < Homebrew::TestCase assert_version_detected '5-20150215', 'gcc5-5-20150215.yosemite.bottle.tar.gz' end + + def test_openssl_style + assert_version_detected '1.0.2a-1', + 'openssl-1.0.2a-1.yosemite.bottle.1.tar.gz' + end end |