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

bottle_version: support openssl style

Browse Source
This commit is contained in:
Xu Cheng 2015-04-15 20:25:30 +08:00
parent 61a711f802
commit 2f757ee5aa
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/bottle_version.rb
View File

@ -7,6 +7,10 @@ class BottleVersion < Version
m = /[a-z]{3}\d-(\d{1}-\d{8})/.match(stem) m = /[a-z]{3}\d-(\d{1}-\d{8})/.match(stem)
return m.captures.first unless m.nil? 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 # e.g. perforce-2013.1.610569-x86_64.mountain_lion.bottle.tar.gz
m = /-([\d\.]+-x86(_64)?)/.match(stem) m = /-([\d\.]+-x86(_64)?)/.match(stem)
return m.captures.first unless m.nil? return m.captures.first unless m.nil?

5
Library/Homebrew/test/test_bottle_versions.rb
View File

@ -80,4 +80,9 @@ class BottleVersionParsingTests < Homebrew::TestCase
assert_version_detected '5-20150215', assert_version_detected '5-20150215',
'gcc5-5-20150215.yosemite.bottle.tar.gz' 'gcc5-5-20150215.yosemite.bottle.tar.gz'
end end
def test_openssl_style
assert_version_detected '1.0.2a-1',
'openssl-1.0.2a-1.yosemite.bottle.1.tar.gz'
end
end end