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

upgrade: tab installed_{as_dependency,on_request}

Browse Source
This commit is contained in:
Mike McQuaid 2017-01-09 21:09:46 +00:00
parent ee43c09f7a
commit 89d8864b6b
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,14 +94,24 @@ module Homebrew
.select(&:directory?) .select(&:directory?)
.map { |k| Keg.new(k.resolved_path) } .map { |k| Keg.new(k.resolved_path) }
if f.opt_prefix.directory?
keg = Keg.new(f.opt_prefix.resolved_path)
tab = Tab.for_keg(keg)
end
fi = FormulaInstaller.new(f) fi = FormulaInstaller.new(f)
fi.options = f.build.used_options fi.options = f.build.used_options
fi.options &= f.options fi.options &= f.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.build_from_source = ARGV.build_from_source? || ARGV.build_all_from_source? fi.build_from_source = ARGV.build_from_source? || ARGV.build_all_from_source?
fi.verbose = ARGV.verbose? fi.verbose = ARGV.verbose?
fi.quieter = ARGV.quieter? fi.quieter = ARGV.quieter?
fi.debug = ARGV.debug? fi.debug = ARGV.debug?
fi.installed_on_request = !ARGV.named.empty?
if tab
fi.installed_as_dependency = tab.installed_as_dependency
fi.installed_on_request ||= tab.installed_on_request
end
fi.prelude fi.prelude
oh1 "Upgrading #{f.full_specified_name} #{fi.options.to_a.join " "}" oh1 "Upgrading #{f.full_specified_name} #{fi.options.to_a.join " "}"