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

fetch: rename 'tarball' to 'download'

Browse Source
This commit is contained in:
Jack Nagel 2013-05-16 14:06:26 -05:00
parent db0c93dbae
commit a6f9a1c4a3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/cmd/fetch.rb
View File

@ -1,7 +1,5 @@
require 'formula' require 'formula'
# Downloads the tarballs for the given formulae to the Cache
module Homebrew extend self module Homebrew extend self
def fetch def fetch
raise FormulaUnspecifiedError if ARGV.named.empty? raise FormulaUnspecifiedError if ARGV.named.empty?
@ -27,15 +25,15 @@ module Homebrew extend self
def fetch_formula f def fetch_formula f
f.cached_download.rmtree if already_fetched?(f) && ARGV.force? f.cached_download.rmtree if already_fetched?(f) && ARGV.force?
tarball, _ = f.fetch download, _ = f.fetch
# FIXME why are strategies returning different types? # FIXME why are strategies returning different types?
return unless tarball.is_a? Pathname return unless download.is_a? Pathname
puts "Downloaded to: #{tarball}" unless already_fetched?(f) puts "Downloaded to: #{download}" unless already_fetched?(f)
puts Checksum::TYPES.map { |t| "#{t.to_s.upcase}: #{tarball.send(t)}" } puts Checksum::TYPES.map { |t| "#{t.to_s.upcase}: #{download.send(t)}" }
f.verify_download_integrity(tarball) f.verify_download_integrity(download)
rescue ChecksumMismatchError => e rescue ChecksumMismatchError => e
Homebrew.failed = true Homebrew.failed = true
opoo "Formula reports different #{e.hash_type}: #{e.expected}" opoo "Formula reports different #{e.hash_type}: #{e.expected}"