diff options
| author | Mike McQuaid | 2014-03-24 09:56:14 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2014-03-24 09:56:14 +0000 |
| commit | e4f291084aaa97cad176f13268420b2fbc899ab0 (patch) | |
| tree | ee2e8b0b77f66456119c1ecbdd85c488216989c1 | |
| parent | 0475dbe5cc34aff97a249e385bacf9da38a702e6 (diff) | |
| download | brew-e4f291084aaa97cad176f13268420b2fbc899ab0.tar.bz2 | |
bottle_version: handle pazpar2 style.
| -rw-r--r-- | Library/Homebrew/bottle_version.rb | 8 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_bottle_versions.rb | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Library/Homebrew/bottle_version.rb b/Library/Homebrew/bottle_version.rb index acf48d869..6d270db03 100644 --- a/Library/Homebrew/bottle_version.rb +++ b/Library/Homebrew/bottle_version.rb @@ -9,12 +9,16 @@ class BottleVersion < Version # e.g. x264-r2197.4.mavericks.bottle.tar.gz # e.g. lz4-r114.mavericks.bottle.tar.gz - m = /(r\d+\.?\d*)/.match(stem) + m = /-(r\d+\.?\d*)/.match(stem) + return m.captures.first unless m.nil? + + # e.g. 1.6.39 from pazpar2-1.6.39.mavericks.bottle.tar.gz + m = /-(\d+\.\d+(\.\d+)+)/.match(stem) return m.captures.first unless m.nil? # e.g. ssh-copy-id-6.2p2.mountain_lion.bottle.tar.gz # e.g. icu4c-52.1.mountain_lion.bottle.tar.gz - m = /(\d+\.(\d)+(p(\d)+)?)/.match(stem) + m = /-(\d+\.(\d)+(p(\d)+)?)/.match(stem) return m.captures.first unless m.nil? super diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb index 717facb70..01db32d6f 100644 --- a/Library/Homebrew/test/test_bottle_versions.rb +++ b/Library/Homebrew/test/test_bottle_versions.rb @@ -30,4 +30,9 @@ class BottleVersionParsingTests < Test::Unit::TestCase assert_version_detected 'r114', '/usr/local/lz4-r114.mavericks.bottle.tar.gz' end + + def test_pazpar2_style + assert_version_detected '1.6.39', + '/usr/local/pazpar2-1.6.39.mavericks.bottle.tar.gz' + end end |