diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb index cb0fd4660e08478c9123d6f3ace62ce35a26df9b..24b1b06145c5b396f4a88130098dac2120f435cb 100644 --- a/Library/Homebrew/cmd/fetch.rb +++ b/Library/Homebrew/cmd/fetch.rb @@ -25,7 +25,7 @@ module Homebrew extend self def fetch_formula f f.cached_download.rmtree if already_fetched?(f) && ARGV.force? - download, _ = f.fetch + download = f.fetch # FIXME why are strategies returning different types? return unless download.is_a? Pathname diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index dafb18ed0c6ad2851a70fcbbb1549a35fd6845e8..53aec6dcf642e146645be14e309c38b3c9128576 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -618,7 +618,7 @@ class Formula def fetch # Ensure the cache exists HOMEBREW_CACHE.mkpath - return downloader.fetch, downloader + downloader.fetch end # For FormulaInstaller. @@ -643,8 +643,8 @@ class Formula private def stage - fetched, downloader = fetch - verify_download_integrity fetched if fetched.kind_of? Pathname + fetched = fetch + verify_download_integrity(fetched) if fetched.kind_of? Pathname mktemp do downloader.stage # Set path after the downloader changes the working folder. diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index e397195ef3505c457df3336826f89ba44579bc21..fa7578c4f5f034271c4491559cd28bf3fdd5ee46 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -406,8 +406,8 @@ class FormulaInstaller end def pour - fetched, downloader = f.fetch - f.verify_download_integrity fetched unless downloader.local_bottle_path + fetched, downloader = f.fetch, f.downloader + f.verify_download_integrity(fetched) unless downloader.local_bottle_path HOMEBREW_CELLAR.cd do downloader.stage end