diff options
| author | Mike McQuaid | 2014-10-20 08:57:19 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2014-10-20 08:57:19 +0100 |
| commit | 7a06bc067e292bb55b63b65a7f5cdf544c5aad12 (patch) | |
| tree | e10664461bfca892185adb3dcfbfddf1c92950e0 /Library | |
| parent | bb167ef902a431c90404610935c7716e3e0b9a95 (diff) | |
| download | brew-7a06bc067e292bb55b63b65a7f5cdf544c5aad12.tar.bz2 | |
bottle_version: handle libpano.
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 3a8f413f2..c05ab8a83 100644 --- a/Library/Homebrew/bottle_version.rb +++ b/Library/Homebrew/bottle_version.rb @@ -16,6 +16,10 @@ class BottleVersion < Version m = /(00-\d+\.\d+(\.\d+)+)/.match(stem) return m.captures.first unless m.nil? + # e.g. 13-2.9.19 from libpano-13-2.9.19_1.yosemite.bottle.tar.gz + m = /\D+-(\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? diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb index 06cde4051..20eff1246 100644 --- a/Library/Homebrew/test/test_bottle_versions.rb +++ b/Library/Homebrew/test/test_bottle_versions.rb @@ -55,4 +55,9 @@ class BottleVersionParsingTests < Homebrew::TestCase assert_version_detected 'R16B03-1', 'erlang-R16B03-1.mavericks.bottle.2.tar.gz' end + + def test_libpano_style + assert_version_detected '13-2.9.19', + 'libpano-13-2.9.19_1.yosemite.bottle.tar.gz' + end end |