From f13ac9b0c8c03ccb72aeed29d2969014d7f660e8 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 15 Jun 2015 21:32:15 -0400 Subject: [PATCH] Decouple the local bottle strategy from the formula --- Library/Homebrew/download_strategy.rb | 4 ++-- Library/Homebrew/formula_installer.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index b51c4cc292..93cd4250c9 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -417,8 +417,8 @@ end class LocalBottleDownloadStrategy < AbstractFileDownloadStrategy attr_reader :cached_location - def initialize(formula) - @cached_location = formula.local_bottle_path + def initialize(path) + @cached_location = path end def stage diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 52bf3a0a3b..feffb177fd 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -610,8 +610,8 @@ class FormulaInstaller return if Homebrew::Hooks::Bottles.pour_formula_bottle(formula) end - if formula.local_bottle_path - downloader = LocalBottleDownloadStrategy.new(formula) + if (bottle_path = formula.local_bottle_path) + downloader = LocalBottleDownloadStrategy.new(bottle_path) else downloader = formula.bottle downloader.verify_download_integrity(downloader.fetch)