aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorMike McQuaid2016-08-14 09:44:07 +0100
committerGitHub2016-08-14 09:44:07 +0100
commitc008797ffebde5fdcc92ecb9dba5564240683783 (patch)
tree788d619b4c60e917eeef4f1f7bebf6cc769c3bd5 /Library/Homebrew
parent5b9fd5c82ccb9233013672168d48af73ae6b9b1f (diff)
parentda52fb67f0076e6be6be61d396d4da16cb3db1b1 (diff)
downloadbrew-c008797ffebde5fdcc92ecb9dba5564240683783.tar.bz2
Merge pull request #677 from sjackman/print-dependencies
install_dependencies: Do not truncate dependencies
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/formula_installer.rb5
-rw-r--r--Library/Homebrew/utils.rb6
2 files changed, 7 insertions, 4 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 5a269eef4..54581b232 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -406,8 +406,9 @@ class FormulaInstaller
def install_dependencies(deps)
if deps.empty? && only_deps?
puts "All dependencies for #{formula.full_name} are satisfied."
- else
- oh1 "Installing dependencies for #{formula.full_name}: #{Tty.green}#{deps.map(&:first)*", "}#{Tty.reset}" unless deps.empty?
+ elsif !deps.empty?
+ oh1 "Installing dependencies for #{formula.full_name}: #{Tty.green}#{deps.map(&:first)*", "}#{Tty.reset}",
+ :truncate => false
deps.each { |dep, options| install_dependency(dep, options) }
end
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index f78fbfcb7..71f03c6d5 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -88,8 +88,10 @@ def ohai(title, *sput)
puts sput
end
-def oh1(title)
- title = Tty.truncate(title) if $stdout.tty? && !ARGV.verbose?
+def oh1(title, options = {})
+ if $stdout.tty? && !ARGV.verbose? && options.fetch(:truncate, :auto) == :auto
+ title = Tty.truncate(title)
+ end
puts "#{Tty.green}==>#{Tty.white} #{title}#{Tty.reset}"
end