Always dump full configuration

3 files changed, 4 insertions, 31 deletions

diff --git a/Library/Homebrew/cmd/config.rb b/Library/Homebrew/cmd/config.rb
index 652ea17c6..9d8835e41 100644
--- a/Library/Homebrew/cmd/config.rb
+++ b/Library/Homebrew/cmd/config.rb
@@ -2,7 +2,7 @@ require 'hardware'
 
 module Homebrew
   def config
-    dump_verbose_config(STDOUT)
+    dump_verbose_config
   end
 
   def llvm
@@ -94,34 +94,7 @@ module Homebrew
     @ponk.join(", ") unless @ponk.empty?
   end
 
-  # we try to keep output minimal
-  def dump_build_config(f=STDOUT)
-    f.puts "HOMEBREW_VERSION: #{HOMEBREW_VERSION}"
-    f.puts "HEAD: #{head}"
-    f.puts "HOMEBREW_PREFIX: #{HOMEBREW_PREFIX}" if HOMEBREW_PREFIX.to_s != "/usr/local"
-    f.puts "HOMEBREW_CELLAR: #{HOMEBREW_CELLAR}" if HOMEBREW_CELLAR.to_s != "#{HOMEBREW_PREFIX}/Cellar"
-    f.puts hardware
-    f.puts "OS X: #{MACOS_FULL_VERSION}-#{kernel}"
-    f.puts "Xcode: #{xcode}" if xcode
-    f.puts "CLT: #{clt}" if clt
-
-    ruby_version = MacOS.version >= "10.9" ? "2.0" : "1.8"
-    if RUBY_VERSION[/\d\.\d/] != ruby_version
-      f.puts "#{RUBY_PATH}:\n  #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}"
-    end
-
-    unless MacOS.compilers_standard?
-      f.puts "GCC-4.0: build #{gcc_40}" if gcc_40
-      f.puts "GCC-4.2: build #{gcc_42}" if gcc_42
-      f.puts "LLVM-GCC: build #{llvm}"  if llvm
-      f.puts "Clang: #{clang ? "#{clang} build #{clang_build}" : "N/A"}"
-    end
-
-    f.puts "MacPorts/Fink: #{macports_or_fink}" if macports_or_fink
-    f.puts "X11: #{describe_x11}"
-  end
-
-  def dump_verbose_config(f)
+  def dump_verbose_config(f=$stdout)
     f.puts "HOMEBREW_VERSION: #{HOMEBREW_VERSION}"
     f.puts "ORIGIN: #{origin}"
     f.puts "HEAD: #{head}"
diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb
index 66d5c33d2..b82bb6111 100644
--- a/Library/Homebrew/exceptions.rb
+++ b/Library/Homebrew/exceptions.rb
@@ -166,7 +166,7 @@ class BuildError < RuntimeError
         puts "Path: #{formula.path}"
       end
       ohai "Configuration"
-      Homebrew.dump_build_config
+      Homebrew.dump_verbose_config
       ohai "ENV"
       Homebrew.dump_build_env(env)
       puts
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 2f25a5c30..a4a7a4cff 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -687,7 +687,7 @@ class Formula
         Kernel.system "/usr/bin/tail", "-n", "5", logfn unless verbose
         log.puts
         require 'cmd/config'
-        Homebrew.dump_build_config(log)
+        Homebrew.dump_verbose_config(log)
         raise BuildError.new(self, cmd, args, ENV.to_hash)
       end
     ensure