aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2017-05-07 21:13:52 +0100
committerGitHub2017-05-07 21:13:52 +0100
commite4ecf6d6bc30914cc3bcb0a45ff2a573a920a844 (patch)
tree6c4feaf17ad1cd2b8f83effdb68a620b80761f04
parent0d5956948e597efd4186fbc590fa664f9ed6f429 (diff)
parentcb5316fc17a3c9701f7ce57a62c7079a2cffd64d (diff)
downloadbrew-e4ecf6d6bc30914cc3bcb0a45ff2a573a920a844.tar.bz2
Merge pull request #2591 from retokromer/patch-1
fix date-based versioning
-rw-r--r--Library/Homebrew/version.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/Library/Homebrew/version.rb b/Library/Homebrew/version.rb
index 56ef37f72..da239f788 100644
--- a/Library/Homebrew/version.rb
+++ b/Library/Homebrew/version.rb
@@ -316,6 +316,11 @@ class Version
spec.stem
end
+ # date-based versioning
+ # e.g. ltopers-v2017-04-14.tar.gz
+ m = /-v?(\d{4}-\d{2}-\d{2})/.match(stem)
+ return m.captures.first unless m.nil?
+
# GitHub tarballs
# e.g. https://github.com/foo/bar/tarball/v1.2.3
# e.g. https://github.com/sam-github/libnet/tarball/libnet-1.1.4
@@ -344,11 +349,6 @@ class Version
m = /[-v]((?:\d+\.)*\d+)$/.match(spec_s)
return m.captures.first unless m.nil?
- # date-based versioning
- # e.g. ltopers-v2017-04-14.tar.gz
- m = /-v?(\d{4}-\d{2}-\d{2})/.match(stem)
- return m.captures.first unless m.nil?
-
# e.g. lame-398-1
m = /-((?:\d)+-\d+)/.match(stem)
return m.captures.first unless m.nil?