From daef74aa27b8316865a44484fefd2d7c424c7342 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Thu, 16 May 2013 14:06:26 -0500
Subject: [PATCH] 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.
---
 Library/Homebrew/cmd/fetch.rb         | 2 +-
 Library/Homebrew/formula.rb           | 6 +++---
 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 cb0fd4660e..24b1b06145 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 dafb18ed0c..53aec6dcf6 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 e397195ef3..fa7578c4f5 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