diff options
| author | Jack Nagel | 2014-10-06 13:55:23 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-10-06 13:55:23 -0500 |
| commit | dfb7657557e712844a0142c956ddd87cc87a5b8f (patch) | |
| tree | d0e511570faa4d38190976d448d2d9e8a0e5b479 /Library | |
| parent | 764d8b676d7fe846acffd058c3011c174609204a (diff) | |
| download | brew-dfb7657557e712844a0142c956ddd87cc87a5b8f.tar.bz2 | |
Compare patchlevels numerically rather than lexically
Fixes Homebrew/homebrew#32960.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/test/test_versions.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/version.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb index 02bd38368..2c6c2e8fb 100644 --- a/Library/Homebrew/test/test_versions.rb +++ b/Library/Homebrew/test/test_versions.rb @@ -37,6 +37,7 @@ class VersionComparisonTests < Homebrew::TestCase def test_patchlevel assert_operator version('1.2.3-p34'), :>, version('1.2.3-p33') assert_operator version('1.2.3-p33'), :<, version('1.2.3-p34') + assert_operator version('1.2.3-p10'), :>, version('1.2.3-p9') end def test_HEAD diff --git a/Library/Homebrew/version.rb b/Library/Homebrew/version.rb index 346e36f93..63097ba8c 100644 --- a/Library/Homebrew/version.rb +++ b/Library/Homebrew/version.rb @@ -80,7 +80,7 @@ class Version class CompositeToken < StringToken def rev - value[/([0-9]+)/, 1] || "0" + value[/[0-9]+/].to_i end end |
