Skip to content

Commit

Permalink
formula_installer: tweak dependent requirements.
Browse files Browse the repository at this point in the history 
If a requirement is for a dependent that's already installed and that
dependency is not using a `default_formula` (which would have already
been converted from a `Requirement` to `Dependency` at this stage) then
we want to stop it killing the build.
  • Loading branch information
@MikeMcQuaid
MikeMcQuaid committed Aug 9, 2016
1 parent 202e5f5 commit cc752e9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Library/Homebrew/formula_installer.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ def check_requirements(req_map)
fatals = []

req_map.each_pair do |dependent, reqs|
next if dependent.installed?
reqs.each do |req|
next if dependent.installed? && req.name == "maximummacos"
puts "#{dependent}: #{req.message}"
fatals << req if req.fatal?
end
Expand Down

2 comments on commit cc752e9

@DomT4
Copy link
Contributor

@DomT4 DomT4 commented on cc752e9 Aug 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not quite sure why, but this seems to have broken the (admittedly mildly hacky) intention of:

next if dependent.installed? && req.name == "maximummacos"
~> brew install wxmac --devel
==> Summary
🍺  /usr/local/Cellar/wxmac/3.1.0_2: 811 files, 24M, built in 9 minutes 48 seconds
~> brew install rabbitmq
...
wxmac: This formula either does not compile or function as expected on OS X
versions newer than El Capitan due to an upstream incompatibility.
Error: An unsatisfied requirement failed this build.

@DomT4
Copy link
Contributor

@DomT4 DomT4 commented on cc752e9 Aug 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turns out I'm an idiot. Ignore the above 🙈.

Please sign in to comment.