diff options
| author | Baptiste Fontaine | 2015-01-28 09:28:20 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2015-01-28 14:19:21 +0000 |
| commit | a9e8dfb9960b6d3c75f7152a16f7496b41679943 (patch) | |
| tree | abc6d48a2c600dd2c450a9d7aa984f63b95e9185 /Library | |
| parent | 5ac0446fd704dd9af4b507bdbb9cd373b1929f7c (diff) | |
| download | brew-a9e8dfb9960b6d3c75f7152a16f7496b41679943.tar.bz2 | |
Fix version misdetections for URLs with OS/archs
Closes Homebrew/homebrew#36308.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/test/test_versions.rb | 14 | ||||
| -rw-r--r-- | Library/Homebrew/version.rb | 10 |
2 files changed, 24 insertions, 0 deletions
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb index 2c6c2e8fb..52352ce8d 100644 --- a/Library/Homebrew/test/test_versions.rb +++ b/Library/Homebrew/test/test_versions.rb @@ -342,4 +342,18 @@ class VersionParsingTests < Homebrew::TestCase assert_version_detected '2.4c', 'http://loop-aes.sourceforge.net/aespipe/aespipe-v2.4c.tar.bz2' end + + def test_win_style + assert_version_detected '0.9.17', + 'http://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-0.9.17-w32.zip' + assert_version_detected '1.29', + 'http://ftpmirror.gnu.org/libidn/libidn-1.29-win64.zip' + end + + def test_with_arch + assert_version_detected '4.0.18-1', + 'http://ftpmirror.gnu.org/mtools/mtools-4.0.18-1.i686.rpm' + assert_version_detected '2.8', + 'http://ftpmirror.gnu.org/libtasn1/libtasn1-2.8-x86.zip' + end end diff --git a/Library/Homebrew/version.rb b/Library/Homebrew/version.rb index ca5311c8f..f94645208 100644 --- a/Library/Homebrew/version.rb +++ b/Library/Homebrew/version.rb @@ -293,6 +293,16 @@ class Version m = /-((?:\d+\.)*\d+-beta\d*)$/.match(stem) return m.captures.first unless m.nil? + # e.g. http://ftpmirror.gnu.org/libidn/libidn-1.29-win64.zip + # e.g. http://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-0.9.17-w32.zip + m = /-(\d+\.\d+(?:\.\d+)?)-w(?:in)?(?:32|64)$/.match(stem) + return m.captures.first unless m.nil? + + # e.g. http://ftpmirror.gnu.org/mtools/mtools-4.0.18-1.i686.rpm + # e.g. http://ftpmirror.gnu.org/libtasn1/libtasn1-2.8-x86.zip + m = /-(\d+\.\d+(?:\.\d+)?(?:-\d+)?)[-_.](?:i686|x86(?:[-_](?:32|64))?)$/.match(stem) + return m.captures.first unless m.nil? + # e.g. foobar4.5.1 m = /((?:\d+\.)*\d+)$/.match(stem) return m.captures.first unless m.nil? |