From 2b9c350b27888896886ffc6e75d2b6bbbdea4bcd Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 6 May 2014 18:28:46 +0100 Subject: [PATCH] bottle_version: handle zpython bottle. Closes Homebrew/homebrew#28870. Signed-off-by: Mike McQuaid --- Library/Homebrew/bottle_version.rb | 4 ++++ Library/Homebrew/test/test_bottle_versions.rb | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/Library/Homebrew/bottle_version.rb b/Library/Homebrew/bottle_version.rb index bf1b0a1e18..2d1bfb04ea 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 3346a094e6..a37f07307f 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