admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Restore some things to failed install config dump

Browse Source 
Closes Homebrew/homebrew#11091.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-07-08 12:22:25 -05:00
parent 1478615429
commit a8c05c9772
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/cmd/--config.rb
View File

@ -45,11 +45,11 @@ module Homebrew extend self
@describe_clt ||= if MacOS.clt_installed? then MacOS.clt_version else 'N/A' end @describe_clt ||= if MacOS.clt_installed? then MacOS.clt_version else 'N/A' end
end end
def sha def head
sha = HOMEBREW_REPOSITORY.cd do head = HOMEBREW_REPOSITORY.cd do
`git rev-parse --verify -q HEAD 2>/dev/null`.chomp `git rev-parse --verify -q HEAD 2>/dev/null`.chomp
end end
if sha.empty? then "(none)" else sha end if head.empty? then "(none)" else head end
end end
def describe_path path def describe_path path
@ -85,11 +85,14 @@ module Homebrew extend self
# we try to keep output minimal # we try to keep output minimal
def dump_build_config def dump_build_config
puts "HOMEBREW_VERSION: #{HOMEBREW_VERSION}"
puts "HEAD: #{head}"
puts "HOMEBREW_PREFIX: #{HOMEBREW_PREFIX}" if HOMEBREW_PREFIX.to_s != "/usr/local" puts "HOMEBREW_PREFIX: #{HOMEBREW_PREFIX}" if HOMEBREW_PREFIX.to_s != "/usr/local"
puts "HOMEBREW_CELLAR: #{HOMEBREW_CELLAR}" if HOMEBREW_CELLAR.to_s != "#{HOMEBREW_PREFIX}/Cellar" puts "HOMEBREW_CELLAR: #{HOMEBREW_CELLAR}" if HOMEBREW_CELLAR.to_s != "#{HOMEBREW_PREFIX}/Cellar"
puts hardware puts hardware
puts "OS X: #{MACOS_FULL_VERSION}-#{kernel}" puts "OS X: #{MACOS_FULL_VERSION}-#{kernel}"
puts "Xcode: #{describe_xcode}" puts "Xcode: #{describe_xcode}"
puts "CLT: #{describe_clt}" if MacOS.xcode_version.to_f >= 4.3
puts "/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby:\n #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}" if RUBY_VERSION.to_f != 1.8 puts "/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby:\n #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}" if RUBY_VERSION.to_f != 1.8
unless MacOS.compilers_standard? unless MacOS.compilers_standard?
@ -108,7 +111,7 @@ module Homebrew extend self
def config_s def config_s
config_s = <<-EOS.undent config_s = <<-EOS.undent
HOMEBREW_VERSION: #{HOMEBREW_VERSION} HOMEBREW_VERSION: #{HOMEBREW_VERSION}
HEAD: #{sha} HEAD: #{head}
HOMEBREW_PREFIX: #{HOMEBREW_PREFIX} HOMEBREW_PREFIX: #{HOMEBREW_PREFIX}
HOMEBREW_CELLAR: #{HOMEBREW_CELLAR} HOMEBREW_CELLAR: #{HOMEBREW_CELLAR}
#{hardware} #{hardware}