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

dependencies_helpers: fix pruning of build/test deps

Browse Source 
We need to check that a dependency is a build or test dependency before
checking that it is satisfied in order to prune dependencies as
requested correctly.

Before:

```
❯ brew deps esptool
ca-certificates
cmake
mpdecimal
openssl@1.1
openssl@3
pkg-config
python@3.11
readline
rust
six
sqlite
xz
```

After:

```
❯ brew deps esptool
ca-certificates
cffi
mpdecimal
openssl@1.1
pycparser
python@3.11
readline
six
sqlite
xz
```

Note: You will need build dependencies installed to reproduce the
"before" behaviour.

See #15445.
This commit is contained in:
Carlo Cabrera 2023-06-06 15:44:08 +08:00
parent 9d0b7361d1
commit 7962b3072b
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/dependencies_helpers.rb
View File

@ -45,13 +45,13 @@ module DependenciesHelpers
klass.prune if ignores.include?("recommended?") || dependent.build.without?(dep) klass.prune if ignores.include?("recommended?") || dependent.build.without?(dep)
elsif dep.optional? elsif dep.optional?
klass.prune if includes.exclude?("optional?") && !dependent.build.with?(dep) klass.prune if includes.exclude?("optional?") && !dependent.build.with?(dep)
elsif dep.satisfied?
klass.prune if ignores.include?("satisfied?")
elsif dep.build? || dep.test? elsif dep.build? || dep.test?
keep = false keep = false
keep ||= dep.test? && includes.include?("test?") && dependent == root_dependent keep ||= dep.test? && includes.include?("test?") && dependent == root_dependent
keep ||= dep.build? && includes.include?("build?") keep ||= dep.build? && includes.include?("build?")
klass.prune unless keep klass.prune unless keep
elsif dep.satisfied?
klass.prune if ignores.include?("satisfied?")
end end
# If a tap isn't installed, we can't find the dependencies of one of # If a tap isn't installed, we can't find the dependencies of one of