diff options
| author | Mike McQuaid | 2014-05-06 18:28:46 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2014-05-06 19:34:04 +0100 |
| commit | 6e7ba51379bce76f7eef48effff0b569447dbaca (patch) | |
| tree | efda562bb70795c4a4840ea09734ab9c60e94746 | |
| parent | c9427a958aaec2957c688505bf2209bf94d6ccdc (diff) | |
| download | homebrew-6e7ba51379bce76f7eef48effff0b569447dbaca.tar.bz2 | |
bottle_version: handle zpython bottle.
Closes #28870.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
| -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 bf1b0a1e1..2d1bfb04e 100644 --- a/Library/Homebrew/bottle_version.rb +++ b/Library/Homebrew/bottle_version.rb @@ -12,6 +12,10 @@ class BottleVersion < Version m = /-(r\d+\.?\d*)/.match(stem) return m.captures.first unless m.nil? + # e.g. 00-5.0.5 from zpython-00-5.0.5.mavericks.bottle.tar.gz + m = /(00-\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 3346a094e..a37f07307 100644 --- a/Library/Homebrew/test/test_bottle_versions.rb +++ b/Library/Homebrew/test/test_bottle_versions.rb @@ -40,4 +40,9 @@ class BottleVersionParsingTests < Test::Unit::TestCase assert_version_detected '0_5_0', '/usr/local/disco-0_5_0.mavericks.bottle.tar.gz' end + + def test_zpython_style + assert_version_detected '00-5.0.5', + '/usr/local/zpython-00-5.0.5.mavericks.bottle.tar.gz' + end end |