diff options
| author | Max Howell | 2011-09-05 09:39:55 +0100 |
|---|---|---|
| committer | Max Howell | 2011-09-05 09:44:53 +0100 |
| commit | 9cdfd2797fb547473d460c7b4a0f88a6a7d174b5 (patch) | |
| tree | af4f2e73f3c20e64776d8d3de77fc3b211515180 /Library/Homebrew | |
| parent | 6283ca46b779ce139cd76ae7b1c978af71921e4c (diff) | |
| download | brew-9cdfd2797fb547473d460c7b4a0f88a6a7d174b5.tar.bz2 | |
Fix nil handling in `brew versions`
Fixes Homebrew/homebrew#7392.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/versions.rb | 7 |
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? |
