diff options
| author | Xu Cheng | 2015-04-17 21:36:13 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-04-19 14:21:50 +0800 |
| commit | 5d99a6f2238f52f1ca81f46b6049193118a06bed (patch) | |
| tree | 5dc2c6b58e332cd3134e73658cf9f53ebffc0ed9 | |
| parent | 29d24cabc6009c134e57a0b2e0b92e5d2e42bb72 (diff) | |
| download | homebrew-5d99a6f2238f52f1ca81f46b6049193118a06bed.tar.bz2 | |
stop supporting 0_5_0 style bottle version
The original formula (disco) has been moved to use 0.5.0 style version
string. So actually no one is using such style.
Stop supporting such style, so it wouldn't be ambiguous with revision
part in `Formula#pkg_version`.
Closes #38750.
Signed-off-by: Xu Cheng <xucheng@me.com>
| -rw-r--r-- | Library/Homebrew/bottle_version.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_bottle_versions.rb | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/Library/Homebrew/bottle_version.rb b/Library/Homebrew/bottle_version.rb index de210e12b..a6e488b4f 100644 --- a/Library/Homebrew/bottle_version.rb +++ b/Library/Homebrew/bottle_version.rb @@ -40,10 +40,6 @@ 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? - # e.g. 20120731 from fontforge-20120731.mavericks.bottle.tar.gz m = /-(\d{8})/.match(stem) return m.captures.first unless m.nil? diff --git a/Library/Homebrew/test/test_bottle_versions.rb b/Library/Homebrew/test/test_bottle_versions.rb index 1ba8ba5d9..c6ab855ca 100644 --- a/Library/Homebrew/test/test_bottle_versions.rb +++ b/Library/Homebrew/test/test_bottle_versions.rb @@ -36,11 +36,6 @@ class BottleVersionParsingTests < Homebrew::TestCase '/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 - def test_zpython_style assert_version_detected '00-5.0.5', '/usr/local/zpython-00-5.0.5.mavericks.bottle.tar.gz' |