diff options
| author | Adam Vandenberg | 2013-08-06 19:53:43 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2013-09-11 22:05:27 -0700 |
| commit | 809fc87da02749435da3ffd843691b38f2169811 (patch) | |
| tree | 01f197b5b09e87a2b29b9c6bbfa9538415a3e316 /Library/Homebrew/cmd | |
| parent | d4cf3ef2128105097ee200de9f98c42a022d66da (diff) | |
| download | brew-809fc87da02749435da3ffd843691b38f2169811.tar.bz2 | |
Allow resource fetching
Closes Homebrew/homebrew#20047.
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/fetch.rb | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb index f075bcdce..8af5ff7ca 100644 --- a/Library/Homebrew/cmd/fetch.rb +++ b/Library/Homebrew/cmd/fetch.rb @@ -16,14 +16,36 @@ module Homebrew extend self end puts "Fetching: #{bucket * ', '}" if bucket.size > 1 - bucket.each { |f| fetch_formula(f) } + bucket.each do |f| + fetch_formula(f) + f.resources.each do |r| + fetch_resource(r) + end + end end def already_fetched? f f.cached_download.exist? end + def fetch_resource r + puts "Resource: #{r.name}" + fetch_fetchable r + rescue ChecksumMismatchError => e + Homebrew.failed = true + opoo "Resource #{r.name} reports different #{e.hash_type}: #{e.expected}" + end + def fetch_formula f + fetch_fetchable f + rescue ChecksumMismatchError => e + Homebrew.failed = true + opoo "Formula reports different #{e.hash_type}: #{e.expected}" + end + + private + + def fetch_fetchable f f.cached_download.rmtree if already_fetched?(f) && ARGV.force? download = f.fetch @@ -33,8 +55,5 @@ module Homebrew extend self puts Checksum::TYPES.map { |t| "#{t.to_s.upcase}: #{download.send(t)}" } f.verify_download_integrity(download) - rescue ChecksumMismatchError => e - Homebrew.failed = true - opoo "Formula reports different #{e.hash_type}: #{e.expected}" end end |
