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

formula_installer: remove feature flags.

Browse Source 
We've been testing the recursive dependency check and allowing unlinked
dependencies in CI for a while with no adverse consequences so enable
them globally now for all users.
This commit is contained in:
Mike McQuaid 2017-04-21 12:32:43 +01:00
parent 6e1faf5b88
commit e41f0bf8c8
1 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Library/Homebrew/formula_installer.rb
View File

@ -173,34 +173,22 @@ class FormulaInstaller
EOS EOS
end end
if ENV["HOMEBREW_CHECK_RECURSIVE_VERSION_DEPENDENCIES"] version_hash = {}
version_hash = {} version_conflicts = Set.new
version_conflicts = Set.new recursive_formulae.each do |f|
recursive_formulae.each do |f| name = f.name
name = f.name unversioned_name, = name.split("@")
unversioned_name, = name.split("@") version_hash[unversioned_name] ||= Set.new
version_hash[unversioned_name] ||= Set.new version_hash[unversioned_name] << name
version_hash[unversioned_name] << name next if version_hash[unversioned_name].length < 2
next if version_hash[unversioned_name].length < 2 version_conflicts += version_hash[unversioned_name]
version_conflicts += version_hash[unversioned_name]
end
unless version_conflicts.empty?
raise CannotInstallFormulaError, <<-EOS.undent
#{formula.full_name} contains conflicting version recursive dependencies:
#{version_conflicts.to_a.join ", "}
View these with `brew deps --tree #{formula.full_name}`.
EOS
end
end end
unless version_conflicts.empty?
unless ENV["HOMEBREW_NO_CHECK_UNLINKED_DEPENDENCIES"] raise CannotInstallFormulaError, <<-EOS.undent
unlinked_deps = recursive_formulae.select do |dep| #{formula.full_name} contains conflicting version recursive dependencies:
dep.installed? && !dep.keg_only? && !dep.linked_keg.directory? #{version_conflicts.to_a.join ", "}
end View these with `brew deps --tree #{formula.full_name}`.
EOS
unless unlinked_deps.empty?
raise CannotInstallFormulaError, "You must `brew link #{unlinked_deps*" "}` before #{formula.full_name} can be installed"
end
end end
pinned_unsatisfied_deps = recursive_deps.select do |dep| pinned_unsatisfied_deps = recursive_deps.select do |dep|