From 27d2a95e8fbf1819fd872fdde191bea2800a77e4 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 21 Sep 2011 17:14:54 -0500 Subject: Correctly parse ImageMagick bottle version Commit 2695821e98 ("Only use the bottle if its version is up-to-date") essentially broke the ImageMagick bottle, because the version parsing logic returns "1" as the bottle version. Fixing this requires only a slight modification to the bottle URL regex; includes a test. Signed-off-by: Jack Nagel --- Library/Homebrew/extend/pathname.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Library/Homebrew/extend/pathname.rb') diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb index 2f23af7e5..095a0aa1a 100644 --- a/Library/Homebrew/extend/pathname.rb +++ b/Library/Homebrew/extend/pathname.rb @@ -165,7 +165,7 @@ class Pathname return $1 if $1 # brew bottle style e.g. qt-4.7.3-bottle.tar.gz - /-((\d+\.)*\d+)-bottle$/.match stem + /-((\d+\.)*\d+(-\d)*)-bottle$/.match stem return $1 if $1 # eg. otp_src_R13B (this is erlang's style) -- cgit v1.2.3