aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMax Howell2011-09-05 09:39:55 +0100
committerMax Howell2011-09-05 09:44:53 +0100
commitc32315b566dec700950896c4fb1f22e68463bb56 (patch)
treeb4e5776a743c74aa899bf0836b885f6f31753275 /Library
parenta3556cd31fc58493d88a2bccc621b9901386a02b (diff)
downloadhomebrew-c32315b566dec700950896c4fb1f22e68463bb56.tar.bz2
Fix nil handling in `brew versions`
Fixes #7392.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/cmd/versions.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/versions.rb b/Library/Homebrew/cmd/versions.rb
index e35eb6382..5283d9cb3 100644
--- a/Library/Homebrew/cmd/versions.rb
+++ b/Library/Homebrew/cmd/versions.rb
@@ -8,7 +8,7 @@ module Homebrew extend self
yielded = []
f.rev_list.each do |sha|
version = f.version_for_sha sha
- unless yielded.include? version
+ unless yielded.include? version or version.nil?
yield version, sha
yielded << version
end
@@ -55,7 +55,10 @@ class Formula
return version[1] unless version.nil?
url = code.match(/class #{Formula.class_s name} < ?Formula.*?(?:url\s|@url\s*=)\s*(?:'|")(.+?)(?:'|").*?end\s/m)
- return Pathname.new(url[1]).version unless url.nil?
+ unless url.nil?
+ version = Pathname.new(url[1]).version
+ return version unless version.to_s.empty?
+ end
head = code.match(/class #{Formula.class_s name} < ?Formula.*?head\s'(.*?)'.*?end\s\s/m)
return 'HEAD' unless head.nil?