From 3f2782e22de1cbf2bf2f6eda188561f3600afc8b Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 31 Oct 2013 14:28:49 -0500 Subject: [PATCH] fetch: check for existing cache file before downloading --- Library/Homebrew/cmd/fetch.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb index c968e60032..1fcc5b28e2 100644 --- a/Library/Homebrew/cmd/fetch.rb +++ b/Library/Homebrew/cmd/fetch.rb @@ -24,10 +24,6 @@ module Homebrew extend self end end - def already_fetched? f - f.cached_download.exist? - end - def fetch_resource r puts "Resource: #{r.name}" fetch_fetchable r @@ -47,11 +43,13 @@ module Homebrew extend self def fetch_fetchable f f.clear_cache if ARGV.force? + + already_fetched = f.cached_download.exist? download = f.fetch return unless download.file? - puts "Downloaded to: #{download}" unless already_fetched?(f) + puts "Downloaded to: #{download}" unless already_fetched puts Checksum::TYPES.map { |t| "#{t.to_s.upcase}: #{download.send(t)}" } f.verify_download_integrity(download)