diff options
| author | Xu Cheng | 2015-03-27 23:10:27 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-03-29 13:12:20 +0800 |
| commit | 8f8061e5f84c2b9d7920506f5d2fde2723a96c45 (patch) | |
| tree | 438e6da731632aa6b4d2c4382a3839ce62458ff0 /Library/Homebrew | |
| parent | 4836dda1d45b666b87b2b04f17b09d69c56039f4 (diff) | |
| download | brew-8f8061e5f84c2b9d7920506f5d2fde2723a96c45.tar.bz2 | |
bottle_version: support apparix-11-062
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/bottle_version.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_bottle_versions.rb | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Library/Homebrew/bottle_version.rb b/Library/Homebrew/bottle_version.rb index 74ffb3136..592105086 100644 --- a/Library/Homebrew/bottle_version.rb +++ b/Library/Homebrew/bottle_version.rb @@ -22,7 +22,9 @@ class BottleVersion < Version return m.captures.first unless m.nil? # e.g. 13-2.9.19 from libpano-13-2.9.19_1.yosemite.bottle.tar.gz - m = /\D+-(\d+-[\d\.]+)/.match(stem) + # e.g. 11-062 from apparix-11-062.yosemite.bottle.tar.gz + # but not 11-062.. from apparix-11-062..bottle.tar.gz + m = /\D+-(\d+-\d+(\.\d+)*)/.match(stem) return m.captures.first unless m.nil? # e.g. 1.6.39 from pazpar2-1.6.39.mavericks.bottle.tar.gz diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb index 529728c53..3e2374e67 100644 --- a/Library/Homebrew/test/test_bottle_versions.rb +++ b/Library/Homebrew/test/test_bottle_versions.rb @@ -75,4 +75,9 @@ class BottleVersionParsingTests < Homebrew::TestCase assert_version_detected '22', 'ngircd-22.mavericks.bottle.tar.gz' end + + def test_apparix_style + assert_version_detected '11-062', + 'apparix-11-062.yosemite.bottle.tar.gz' + end end |