aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-10-06 13:55:23 -0500
committerJack Nagel2014-10-06 13:55:23 -0500
commit9cb153358afc0ce5df944020180546ae63832a18 (patch)
tree73a0277840e0d6e595daa116528358df19859b35 /Library
parent6e783182ab76f2c9e92f1cbdd3922fab3e5a7cfc (diff)
downloadhomebrew-9cb153358afc0ce5df944020180546ae63832a18.tar.bz2
Compare patchlevels numerically rather than lexically
Fixes #32960.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/test/test_versions.rb1
-rw-r--r--Library/Homebrew/version.rb2
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