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

Do this in a saner way

Browse Source
This commit is contained in:
Jack Nagel 2013-06-29 21:35:57 -05:00
parent 936f9487b1
commit 5b75c73df6
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/cmd/doctor.rb
View File

@ -1023,7 +1023,11 @@ def check_for_unlinked_but_not_keg_only
if not rack.directory? if not rack.directory?
true true
elsif not (HOMEBREW_REPOSITORY/"Library/LinkedKegs"/rack.basename).directory? elsif not (HOMEBREW_REPOSITORY/"Library/LinkedKegs"/rack.basename).directory?
Formula.factory(rack.basename.to_s).keg_only? rescue nil begin
Formula.factory(rack.basename.to_s).keg_only?
rescue FormulaUnavailableError
false
end
else else
true true
end end

8
Library/Homebrew/formula.rb
View File

@ -350,8 +350,12 @@ class Formula
end end
def self.installed def self.installed
# `rescue nil` is here to skip kegs with no corresponding formulae HOMEBREW_CELLAR.children.map do |rack|
HOMEBREW_CELLAR.children.map{ |rack| factory(rack.basename.to_s) rescue nil }.compact begin
factory(rack.basename.to_s)
rescue FormulaUnavailableError
end
end.compact
end end
def self.aliases def self.aliases