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

cleanup: load formula from rack and using ARGV.resolved_formulae

Browse Source
This commit is contained in:
Xu Cheng 2015-05-17 20:09:49 +08:00
parent 8a4dcdd5a1
commit dcf0efc9d2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/cmd/cleanup.rb
View File

@ -17,7 +17,7 @@ module Homebrew
rm_DS_Store rm_DS_Store
end end
else else
ARGV.formulae.each { |f| cleanup_formula(f) } ARGV.resolved_formulae.each { |f| cleanup_formula(f) }
end end
end end
@ -32,8 +32,8 @@ module Homebrew
def cleanup_cellar def cleanup_cellar
HOMEBREW_CELLAR.subdirs.each do |rack| HOMEBREW_CELLAR.subdirs.each do |rack|
begin begin
cleanup_formula Formulary.factory(rack.basename.to_s) cleanup_formula Formulary.from_rack(rack)
rescue FormulaUnavailableError rescue FormulaUnavailableError, TapFormulaAmbiguityError
# Don't complain about directories from DIY installs # Don't complain about directories from DIY installs
end end
end end
@ -73,8 +73,8 @@ module Homebrew
next unless (name = file.basename.to_s[/(.*)-(?:#{Regexp.escape(version)})/, 1]) next unless (name = file.basename.to_s[/(.*)-(?:#{Regexp.escape(version)})/, 1])
begin begin
f = Formulary.factory(name) f = Formulary.from_rack(HOMEBREW_CELLAR/name)
rescue FormulaUnavailableError rescue FormulaUnavailableError, TapFormulaAmbiguityError
next next
end end