brew-info: specify whether poured or built.
- Store in the tab if a bottle was poured for the build. - Add an additional line of output to `brew info` outputting whether the formula was built from source or poured from a bottle. Closes Homebrew/homebrew#18430. Closes Homebrew/homebrew#18475.
This commit is contained in:
parent
81f9aef245
commit
b578a47bb9
@ -103,6 +103,13 @@ module Homebrew extend self
|
||||
print " *" if keg.linked?
|
||||
puts
|
||||
tab = Tab.for_keg keg
|
||||
|
||||
# Intentionally print no message if this is nil because it's unknown.
|
||||
case tab.poured_from_bottle
|
||||
when true then puts "Poured from bottle"
|
||||
when false then puts "Built from source"
|
||||
end
|
||||
|
||||
unless tab.used_options.empty?
|
||||
puts " Installed with: #{tab.used_options*', '}"
|
||||
end
|
||||
|
||||
@ -503,7 +503,8 @@ class Formula
|
||||
hsh["installed"] << {
|
||||
"version" => keg.basename.to_s,
|
||||
"used_options" => tab.used_options.map(&:flag),
|
||||
"built_as_bottle" => tab.built_bottle
|
||||
"built_as_bottle" => tab.built_bottle,
|
||||
"poured_from_bottle" => tab.poured_from_bottle
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
@ -97,6 +97,10 @@ class FormulaInstaller
|
||||
if pour_bottle?
|
||||
pour
|
||||
@poured_bottle = true
|
||||
tab = Tab.for_keg f.prefix
|
||||
tab.poured_from_bottle = true
|
||||
tab.tabfile.delete rescue nil
|
||||
tab.write
|
||||
end
|
||||
rescue
|
||||
opoo "Bottle installation failed: building from source."
|
||||
|
||||
@ -21,6 +21,7 @@ class Tab < OpenStruct
|
||||
:unused_options => f.build.unused_options,
|
||||
:tabfile => f.prefix.join(FILENAME),
|
||||
:built_as_bottle => !!ARGV.build_bottle?,
|
||||
:poured_from_bottle => false,
|
||||
:tapped_from => f.tap,
|
||||
:time => Time.now.to_i, # to_s would be better but Ruby has no from_s function :P
|
||||
:HEAD => sha
|
||||
@ -53,6 +54,7 @@ class Tab < OpenStruct
|
||||
Tab.new :used_options => [],
|
||||
:unused_options => (f.build.as_flags rescue []),
|
||||
:built_as_bottle => false,
|
||||
:poured_from_bottle => false,
|
||||
:tapped_from => "",
|
||||
:time => nil,
|
||||
:HEAD => nil
|
||||
@ -93,6 +95,7 @@ class Tab < OpenStruct
|
||||
:used_options => used_options.to_a,
|
||||
:unused_options => unused_options.to_a,
|
||||
:built_as_bottle => built_as_bottle,
|
||||
:poured_from_bottle => poured_from_bottle,
|
||||
:tapped_from => tapped_from,
|
||||
:time => time,
|
||||
:HEAD => send("HEAD")})
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user