diff options
| author | Mike McQuaid | 2014-03-17 10:35:53 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2014-03-17 10:35:53 +0000 |
| commit | f115260a29d387a36399327056ee0a9fa5117c33 (patch) | |
| tree | ed04b051072d788f523ece0c9426aa19be67b097 /Library | |
| parent | 6060ffd5ce7a12b2fb9da262d4a596f9bb9614db (diff) | |
| download | brew-f115260a29d387a36399327056ee0a9fa5117c33.tar.bz2 | |
bottle_version: support lz4 style.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/bottle_version.rb | 3 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_bottle_versions.rb | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Library/Homebrew/bottle_version.rb b/Library/Homebrew/bottle_version.rb index 615980d83..acf48d869 100644 --- a/Library/Homebrew/bottle_version.rb +++ b/Library/Homebrew/bottle_version.rb @@ -8,7 +8,8 @@ class BottleVersion < Version return m.captures.first unless m.nil? # e.g. x264-r2197.4.mavericks.bottle.tar.gz - m = /(r\d+\.\d)/.match(stem) + # e.g. lz4-r114.mavericks.bottle.tar.gz + m = /(r\d+\.?\d*)/.match(stem) return m.captures.first unless m.nil? # e.g. ssh-copy-id-6.2p2.mountain_lion.bottle.tar.gz diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb index 7968d1e19..717facb70 100644 --- a/Library/Homebrew/test/test_bottle_versions.rb +++ b/Library/Homebrew/test/test_bottle_versions.rb @@ -25,4 +25,9 @@ class BottleVersionParsingTests < Test::Unit::TestCase assert_version_detected 'r2197.4', '/usr/local/x264-r2197.4.mavericks.bottle.tar.gz' end + + def test_lz4_style + assert_version_detected 'r114', + '/usr/local/lz4-r114.mavericks.bottle.tar.gz' + end end |