aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend/pathname.rb
diff options
context:
space:
mode:
authorJack Nagel2011-09-21 17:14:54 -0500
committerJack Nagel2011-09-21 17:29:14 -0500
commit27d2a95e8fbf1819fd872fdde191bea2800a77e4 (patch)
treec76cf0ceaca78d4ad50a3db406c438fa9f451c99 /Library/Homebrew/extend/pathname.rb
parent51f010ac390e838e59dfe5c1d2811b7a20f9ab2a (diff)
downloadbrew-27d2a95e8fbf1819fd872fdde191bea2800a77e4.tar.bz2
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 <jacknagel@gmail.com>
Diffstat (limited to 'Library/Homebrew/extend/pathname.rb')
-rw-r--r--Library/Homebrew/extend/pathname.rb2
1 files changed, 1 insertions, 1 deletions
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)