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

Merge pull request #3660 from MikeMcQuaid/unlink-keg-no-sticky

Browse Source 
reinstall/upgrade: stop unlinked kegs being sticky
This commit is contained in:
Mike McQuaid 2018-01-10 18:12:03 +00:00 committed by GitHub
commit 427c6ce3d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/reinstall.rb
View File

@ -39,7 +39,7 @@ module Homebrew
fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.bottle?) fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.bottle?)
fi.interactive = ARGV.interactive? fi.interactive = ARGV.interactive?
fi.git = ARGV.git? fi.git = ARGV.git?
fi.link_keg = keg_was_linked if keg_had_linked_opt fi.link_keg ||= keg_was_linked if keg_had_linked_opt
fi.prelude fi.prelude
oh1 "Reinstalling #{f.full_name} #{options.to_a.join " "}" oh1 "Reinstalling #{f.full_name} #{options.to_a.join " "}"

2
Library/Homebrew/cmd/upgrade.rb
View File

@ -133,7 +133,7 @@ module Homebrew
fi.options = options fi.options = options
fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?) fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?)
fi.installed_on_request = !ARGV.named.empty? fi.installed_on_request = !ARGV.named.empty?
fi.link_keg = keg_was_linked if keg_had_linked_opt fi.link_keg ||= keg_was_linked if keg_had_linked_opt
if tab if tab
fi.installed_as_dependency = tab.installed_as_dependency fi.installed_as_dependency = tab.installed_as_dependency
fi.installed_on_request ||= tab.installed_on_request fi.installed_on_request ||= tab.installed_on_request

6
Library/Homebrew/formula_installer.rb
View File

@ -32,11 +32,11 @@ class FormulaInstaller
attr_reader :formula attr_reader :formula
attr_accessor :options, :build_bottle, :invalid_option_names attr_accessor :options, :build_bottle, :invalid_option_names
attr_accessor :installed_as_dependency, :installed_on_request attr_accessor :installed_as_dependency, :installed_on_request, :link_keg
mode_attr_accessor :show_summary_heading, :show_header mode_attr_accessor :show_summary_heading, :show_header
mode_attr_accessor :build_from_source, :force_bottle mode_attr_accessor :build_from_source, :force_bottle
mode_attr_accessor :ignore_deps, :only_deps, :interactive, :git mode_attr_accessor :ignore_deps, :only_deps, :interactive, :git
mode_attr_accessor :verbose, :debug, :quieter, :link_keg mode_attr_accessor :verbose, :debug, :quieter
def initialize(formula) def initialize(formula)
@formula = formula @formula = formula
@ -562,7 +562,7 @@ class FormulaInstaller
fi.verbose = verbose? fi.verbose = verbose?
fi.quieter = quieter? fi.quieter = quieter?
fi.debug = debug? fi.debug = debug?
fi.link_keg = keg_was_linked if keg_had_linked_keg fi.link_keg ||= keg_was_linked if keg_had_linked_keg
fi.installed_as_dependency = true fi.installed_as_dependency = true
fi.installed_on_request = df.any_version_installed? && tab.installed_on_request fi.installed_on_request = df.any_version_installed? && tab.installed_on_request
fi.prelude fi.prelude