reinstall, upgrade: tweak use of tab build_bottle.

In the case where a bottle wasn't around before and is now it probably
doesn't make sense to use `build-bottle` to build something that will
be identical to the binary bottle package anyway. After all, when you
use the bottle you will end up with something that has been built with
`build-bottle` anyway (just not by you).
This commit is contained in:
Mike McQuaid 2015-03-24 12:11:40 +00:00
parent 959d92a84a
commit 28f26e0c9f
2 changed files with 2 additions and 2 deletions

View File

@ -20,7 +20,7 @@ module Homebrew
fi = FormulaInstaller.new(f) fi = FormulaInstaller.new(f)
fi.options = options fi.options = options
fi.build_bottle = ARGV.build_bottle? || tab.build_bottle? fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && tab.build_bottle?)
fi.build_from_source = ARGV.build_from_source? fi.build_from_source = ARGV.build_from_source?
fi.force_bottle = ARGV.force_bottle? fi.force_bottle = ARGV.force_bottle?
fi.verbose = ARGV.verbose? fi.verbose = ARGV.verbose?

View File

@ -52,7 +52,7 @@ module Homebrew
fi = FormulaInstaller.new(f) fi = FormulaInstaller.new(f)
fi.options = tab.used_options fi.options = tab.used_options
fi.build_bottle = ARGV.build_bottle? || tab.build_bottle? fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && tab.build_bottle?)
fi.build_from_source = ARGV.build_from_source? fi.build_from_source = ARGV.build_from_source?
fi.verbose = ARGV.verbose? fi.verbose = ARGV.verbose?
fi.quieter = ARGV.quieter? fi.quieter = ARGV.quieter?