aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisty De Meo2016-11-03 16:36:20 -0700
committerMisty De Meo2016-11-10 15:08:36 -0800
commitfbcf500a48bd8a6be2f009c35be5ae971e841b87 (patch)
tree73cd6a99532d6170f9e06420bca216b99a534c8c
parent9bac107b31f05cca65d8aab23be05e1b867bd289 (diff)
downloadbrew-fbcf500a48bd8a6be2f009c35be5ae971e841b87.tar.bz2
Version.parse: return Version::NULL for unparseable strings
-rw-r--r--Library/Homebrew/test/testing_env.rb2
-rw-r--r--Library/Homebrew/version.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index 5f98ace15..4f2619464 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -36,7 +36,7 @@ module Homebrew
end
def assert_version_nil(url)
- assert_nil Version.parse(url)
+ assert Version.parse(url).null?
end
end
diff --git a/Library/Homebrew/version.rb b/Library/Homebrew/version.rb
index 433964dc7..57a9c11a5 100644
--- a/Library/Homebrew/version.rb
+++ b/Library/Homebrew/version.rb
@@ -287,7 +287,7 @@ class Version
def self.parse(spec)
version = _parse(spec)
- new(version) unless version.nil?
+ version.nil? ? NULL : new(version)
end
def self._parse(spec)