diff options
| author | Jack Nagel | 2013-05-16 14:06:26 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-05-16 14:06:26 -0500 |
| commit | daef74aa27b8316865a44484fefd2d7c424c7342 (patch) | |
| tree | fe85285b4c4e6c66a62fc8f004dd241e3f11c2ff | |
| parent | a6f9a1c4a3cc8a2cad998caf30522f86c2f4a3de (diff) | |
| download | brew-daef74aa27b8316865a44484fefd2d7c424c7342.tar.bz2 | |
Adjust semantics of Formula#fetch
It doesn't really make logical sense that this method returns both the
fetched path (or sometimes nil!) and the downloader, so just return the
path (again, or nil!) and callers that want the downloader can ask for
it separately.
| -rw-r--r-- | Library/Homebrew/cmd/fetch.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula.rb | 6 | ||||
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb index cb0fd4660..24b1b0614 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 dafb18ed0..53aec6dcf 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 e397195ef..fa7578c4f 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 |