diff options
| author | Alyssa Ross | 2018-01-09 20:02:45 +0000 |
|---|---|---|
| committer | GitHub | 2018-01-09 20:02:45 +0000 |
| commit | f06b54f1bb7dffb319ec7407e309e260ce651517 (patch) | |
| tree | 19cd3e5a2af00aada22ff3fdca3036e684f954cf /Library | |
| parent | 9464616897c9ce73e3cd6d571390797aa554e41c (diff) | |
| parent | ef82b188f2a3977b56db463ef2f0cb0c8f5727e9 (diff) | |
| download | brew-f06b54f1bb7dffb319ec7407e309e260ce651517.tar.bz2 | |
Merge pull request #3653 from alyssais/installed_on_request
Preserve installed_on_request for dependencies
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 1e2d77b2c..32e297e05 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -553,18 +553,18 @@ class FormulaInstaller end fi = FormulaInstaller.new(df) - fi.options |= tab.used_options - fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options) - fi.options |= inherited_options - fi.options &= df.options - fi.build_from_source = ARGV.build_formula_from_source?(df) - fi.force_bottle = false - fi.verbose = verbose? - fi.quieter = quieter? - fi.debug = debug? - fi.link_keg = keg_was_linked if keg_had_linked_keg + fi.options |= tab.used_options + fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options) + fi.options |= inherited_options + fi.options &= df.options + fi.build_from_source = ARGV.build_formula_from_source?(df) + fi.force_bottle = false + fi.verbose = verbose? + fi.quieter = quieter? + fi.debug = debug? + fi.link_keg = keg_was_linked if keg_had_linked_keg fi.installed_as_dependency = true - fi.installed_on_request = false + fi.installed_on_request = df.any_version_installed? && tab.installed_on_request fi.prelude oh1 "Installing #{formula.full_name} dependency: #{Formatter.identifier(dep.name)}" fi.install |