Fix some bottling logic
- We've never supported `devel` bottles so don't bother outputting their status to `brew info` - Don't `brew upgrade` or `brew reinstall` bottles if they were previously built as a bottle unless there's no bottles defined at all (rather than there was no compatible bottles). Fixes #5532.
This commit is contained in:
parent
01a8fda807
commit
a24197bcc9
@ -174,9 +174,7 @@ module Homebrew
|
||||
end
|
||||
|
||||
if devel = f.devel
|
||||
s = "devel #{devel.version}"
|
||||
s += " (bottled)" if devel.bottled?
|
||||
specs << s
|
||||
specs << "devel #{devel.version}"
|
||||
end
|
||||
|
||||
specs << "HEAD" if f.head
|
||||
|
@ -147,7 +147,7 @@ module Homebrew
|
||||
|
||||
fi = FormulaInstaller.new(f)
|
||||
fi.options = options
|
||||
fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.bottle?)
|
||||
fi.build_bottle = ARGV.build_bottle? || (!f.bottle_defined? && f.build.bottle?)
|
||||
fi.installed_on_request = !ARGV.named.empty?
|
||||
fi.link_keg ||= keg_was_linked if keg_had_linked_opt
|
||||
if tab
|
||||
|
@ -21,7 +21,7 @@ module Homebrew
|
||||
fi = FormulaInstaller.new(f)
|
||||
fi.options = options
|
||||
fi.invalid_option_names = build_options.invalid_option_names
|
||||
fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.bottle?)
|
||||
fi.build_bottle = ARGV.build_bottle? || (!f.bottle_defined? && f.build.bottle?)
|
||||
fi.interactive = ARGV.interactive?
|
||||
fi.git = ARGV.git?
|
||||
fi.link_keg ||= keg_was_linked if keg_had_linked_opt
|
||||
|
Loading…
x
Reference in New Issue
Block a user