aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-12-29 14:53:22 -0500
committerJack Nagel2014-12-29 14:59:18 -0500
commitd48f73b94072715c10fe194ee1f443827c8d1b7f (patch)
treea505fe3300c4ee2521f63c38e272da99b7721541
parent4d2787cae16c06b0154348085c7c7a31e640ce50 (diff)
downloadhomebrew-d48f73b94072715c10fe194ee1f443827c8d1b7f.tar.bz2
Remove duplicated logic from FromUrlLoader
-rw-r--r--Library/Homebrew/formulary.rb21
1 files changed, 4 insertions, 17 deletions
diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index 3ee853704..65a790639 100644
--- a/Library/Homebrew/formulary.rb
+++ b/Library/Homebrew/formulary.rb
@@ -143,23 +143,10 @@ class Formulary
super formula, HOMEBREW_CACHE_FORMULA/File.basename(uri.path)
end
- # Downloads the formula's .rb file
- def fetch
- begin
- have_klass = Formulary.formula_class_defined? class_name
- rescue NameError
- raise FormulaUnavailableError.new(name)
- end
-
- unless have_klass
- HOMEBREW_CACHE_FORMULA.mkpath
- FileUtils.rm path.to_s, :force => true
- curl url, '-o', path.to_s
- end
- end
-
- def get_formula(spec)
- fetch
+ def load_file
+ HOMEBREW_CACHE_FORMULA.mkpath
+ FileUtils.rm_f(path)
+ curl url, "-o", path
super
end
end