aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2014-10-19 13:54:00 +0100
committerMike McQuaid2014-10-21 23:04:55 +0100
commit19016c96321636e30bc8e4713e50c9c92b2ea859 (patch)
tree747924d02e59bc5660b5b9e600ceb19e0cb730cc
parent21cfc2a30e9b32f6b9f90b2bd8a756f6edbd8842 (diff)
downloadhomebrew-19016c96321636e30bc8e4713e50c9c92b2ea859.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 #33220.
-rw-r--r--Library/Homebrew/cmd/fetch.rb2
-rw-r--r--Library/Homebrew/cmd/install.rb2
-rw-r--r--Library/Homebrew/formula.rb7
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)