aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/pathname+yeast.rb2
-rwxr-xr-xLibrary/Homebrew/unittest.rb5
2 files changed, 6 insertions, 1 deletions
diff --git a/Library/Homebrew/pathname+yeast.rb b/Library/Homebrew/pathname+yeast.rb
index 6bdd42334..cf068d0fa 100644
--- a/Library/Homebrew/pathname+yeast.rb
+++ b/Library/Homebrew/pathname+yeast.rb
@@ -118,7 +118,7 @@ class Pathname
# eg. foobar-4.5.1-1
# eg. ruby-1.9.1-p243
- /-((\d+\.)*\d\.\d+-p?\d+)$/.match stem
+ /-((\d+\.)*\d\.\d+-(p|rc)?\d+)$/.match stem
return $1 if $1
# eg. lame-398-1
diff --git a/Library/Homebrew/unittest.rb b/Library/Homebrew/unittest.rb
index 0ef29f4f2..255b55601 100755
--- a/Library/Homebrew/unittest.rb
+++ b/Library/Homebrew/unittest.rb
@@ -477,4 +477,9 @@ class BeerTasting <Test::Unit::TestCase
assert_equal Formula.class_s('pkg-config'), 'PkgConfig'
assert_equal Formula.class_s('foo_bar'), 'FooBar'
end
+
+ def test_version_style_rc
+ f=MockFormula.new 'http://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz'
+ assert_equal '1.8.0-rc1', f.version
+ end
end