admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Fix nil handling in brew versions

Browse Source 
Fixes Homebrew/homebrew#7392.
This commit is contained in:
Max Howell 2011-09-05 09:39:55 +01:00
parent 6283ca46b7
commit 9cdfd2797f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/cmd/versions.rb
View File

@ -8,7 +8,7 @@ module Homebrew extend self
yielded = [] yielded = []
f.rev_list.each do |sha| f.rev_list.each do |sha|
version = f.version_for_sha sha version = f.version_for_sha sha
unless yielded.include? version unless yielded.include? version or version.nil?
yield version, sha yield version, sha
yielded << version yielded << version
end end
@ -55,7 +55,10 @@ class Formula
return version[1] unless version.nil? return version[1] unless version.nil?
url = code.match(/class #{Formula.class_s name} < ?Formula.*?(?:url\s|@url\s*=)\s*(?:'|")(.+?)(?:'|").*?end\s/m) 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) head = code.match(/class #{Formula.class_s name} < ?Formula.*?head\s'(.*?)'.*?end\s\s/m)
return 'HEAD' unless head.nil? return 'HEAD' unless head.nil?