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

Get rid of StandardLoader class

Browse Source
This commit is contained in:
Jack Nagel 2015-01-01 01:21:59 -05:00
parent b7ca3e33d6
commit 34fc227f92
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/formulary.rb
View File

@ -102,13 +102,6 @@ class Formulary
end end
end end
# Loads formulae from Homebrew's provided Library
class StandardLoader < FormulaLoader
def initialize name, path=Formula.path(name)
super
end
end
class AliasLoader < FormulaLoader class AliasLoader < FormulaLoader
def initialize alias_path def initialize alias_path
path = alias_path.resolved_path path = alias_path.resolved_path
@ -202,7 +195,7 @@ class Formulary
formula_with_that_name = Formula.path(ref) formula_with_that_name = Formula.path(ref)
if formula_with_that_name.file? if formula_with_that_name.file?
return StandardLoader.new(ref, formula_with_that_name) return FormulaLoader.new(ref, formula_with_that_name)
end end
possible_alias = Pathname.new("#{HOMEBREW_LIBRARY}/Aliases/#{ref}") possible_alias = Pathname.new("#{HOMEBREW_LIBRARY}/Aliases/#{ref}")
@ -212,9 +205,9 @@ class Formulary
possible_cached_formula = Pathname.new("#{HOMEBREW_CACHE_FORMULA}/#{ref}.rb") possible_cached_formula = Pathname.new("#{HOMEBREW_CACHE_FORMULA}/#{ref}.rb")
if possible_cached_formula.file? if possible_cached_formula.file?
return StandardLoader.new(ref, possible_cached_formula) return FormulaLoader.new(ref, possible_cached_formula)
end end
return StandardLoader.new(ref) return FormulaLoader.new(ref, Formula.path(ref))
end end
end end