From f115260a29d387a36399327056ee0a9fa5117c33 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 17 Mar 2014 10:35:53 +0000 Subject: [PATCH] bottle_version: support lz4 style. --- Library/Homebrew/bottle_version.rb | 3 ++- Library/Homebrew/test/test_bottle_versions.rb | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/bottle_version.rb b/Library/Homebrew/bottle_version.rb index 615980d839..acf48d8693 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 7968d1e19e..717facb705 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