aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisty De Meo2016-11-03 16:52:40 -0700
committerMisty De Meo2016-11-10 15:09:36 -0800
commit4e3d23ad14b29832f14784939acc5afe2f1b28f8 (patch)
tree0c0651471df47856c24f064ce3322aaf4e4475e4
parentd32a1c4c7da96d5cbf12197be1707364d081fa88 (diff)
downloadbrew-4e3d23ad14b29832f14784939acc5afe2f1b28f8.tar.bz2
Resource: set version to nil if version is null
Is this the right fix? This fixes version cascading from the parent.
-rw-r--r--Library/Homebrew/resource.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb
index fe18f14dd..c0e9dbada 100644
--- a/Library/Homebrew/resource.rb
+++ b/Library/Homebrew/resource.rb
@@ -145,7 +145,10 @@ class Resource
end
def version(val = nil)
- @version ||= detect_version(val)
+ @version ||= begin
+ version = detect_version(val)
+ version.null? ? nil : version
+ end
end
def mirror(val)
@@ -155,7 +158,7 @@ class Resource
private
def detect_version(val)
- return if val.nil? && url.nil?
+ return Version::NULL if val.nil? && url.nil?
case val
when nil then Version.detect(url, specs)