aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Library/Homebrew/bottle_version.rb4
-rw-r--r--Library/Homebrew/test/test_bottle_versions.rb5
2 files changed, 9 insertions, 0 deletions
diff --git a/Library/Homebrew/bottle_version.rb b/Library/Homebrew/bottle_version.rb
index 6d270db03..bf1b0a1e1 100644
--- a/Library/Homebrew/bottle_version.rb
+++ b/Library/Homebrew/bottle_version.rb
@@ -21,6 +21,10 @@ class BottleVersion < Version
m = /-(\d+\.(\d)+(p(\d)+)?)/.match(stem)
return m.captures.first unless m.nil?
+ # e.g. 0_5_0 from disco-0_5_0.mavericks.bottle.tar.gz
+ m = /-(\d+_\d+(_\d+)+)/.match(stem)
+ return m.captures.first unless m.nil?
+
super
end
end
diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb
index 01db32d6f..3346a094e 100644
--- a/Library/Homebrew/test/test_bottle_versions.rb
+++ b/Library/Homebrew/test/test_bottle_versions.rb
@@ -35,4 +35,9 @@ class BottleVersionParsingTests < Test::Unit::TestCase
assert_version_detected '1.6.39',
'/usr/local/pazpar2-1.6.39.mavericks.bottle.tar.gz'
end
+
+ def test_disco_style
+ assert_version_detected '0_5_0',
+ '/usr/local/disco-0_5_0.mavericks.bottle.tar.gz'
+ end
end