diff options
| author | Mike McQuaid | 2014-10-19 13:54:00 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2014-10-21 23:04:55 +0100 |
| commit | 356e75487e5fbce964f92e336cee52b9541de65c (patch) | |
| tree | 5d4e027d5e03b5019ea1b97add9733772d38f676 | |
| parent | dcc8309d1bd50f6d3dc7ac2fd8a50cf97ba72eda (diff) | |
| download | brew-356e75487e5fbce964f92e336cee52b9541de65c.tar.bz2 | |
Point to a tap when installing or fetching.
When installing or fetching and stuff goes wrong we can't always catch
the error and redirect to the tap. Instead, point to the tap before we
do anything failure-prone and hopefully that'll encourage people to
file issues in the right place. If not we can say that explicitly.
Closes Homebrew/homebrew#33220.
| -rw-r--r-- | Library/Homebrew/cmd/fetch.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/install.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula.rb | 7 |
3 files changed, 11 insertions, 0 deletions
diff --git a/Library/Homebrew/cmd/fetch.rb b/Library/Homebrew/cmd/fetch.rb index 71b9f6573..5ac41a4d3 100644 --- a/Library/Homebrew/cmd/fetch.rb +++ b/Library/Homebrew/cmd/fetch.rb @@ -17,6 +17,8 @@ module Homebrew puts "Fetching: #{bucket * ', '}" if bucket.size > 1 bucket.each do |f| + f.print_tap_action :verb => "Fetching" + if fetch_bottle?(f) fetch_formula(f.bottle) else diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index b85092467..89eec50fb 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -102,6 +102,8 @@ module Homebrew end def install_formula f + f.print_tap_action + fi = FormulaInstaller.new(f) fi.options = f.build.used_options fi.ignore_deps = ARGV.ignore_deps? diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index e2b602e4a..377888812 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -408,6 +408,13 @@ class Formula end end + def print_tap_action options={} + if tap? + verb = options[:verb] || "Installing" + ohai "#{verb} #{name} from #{tap}" + end + end + # True if this formula is provided by Homebrew itself def core_formula? path == Formula.path(name) |
