aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/extend/pathname.rb2
-rw-r--r--Library/Homebrew/test/test_versions.rb5
2 files changed, 6 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)
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb
index 1febdab0a..5714c4b66 100644
--- a/Library/Homebrew/test/test_versions.rb
+++ b/Library/Homebrew/test/test_versions.rb
@@ -164,4 +164,9 @@ class VersionTests < Test::Unit::TestCase
check 'https://downloads.sourceforge.net/project/machomebrew/Bottles/qt-4.7.3-bottle.tar.gz',
'4.7.3'
end
+
+ def test_imagemagick_bottle_style
+ check 'http://downloads.sf.net/project/machomebrew/Bottles/imagemagick-6.7.1-1-bottle.tar.gz',
+ '6.7.1-1'
+ end
end