mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

dependency: consider bounds when comparing macOS deps

Browse Source
This commit is contained in:
Eric Knibbe 2023-08-28 17:33:01 -04:00
parent 1d136be229
commit df38dcc3d1
No known key found for this signature in database
GPG Key ID: 179D9CDDDB814168
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/dependency.rb
View File

@ -231,6 +231,14 @@ class UsesFromMacOSDependency < Dependency
@bounds = bounds @bounds = bounds
end end
def ==(other)
instance_of?(other.class) && name == other.name && tags == other.tags && bounds == other.bounds
end
def hash
[name, tags, bounds].hash
end
def installed? def installed?
use_macos_install? || super use_macos_install? || super
end end

2
Library/Homebrew/dependency_collector.rb
View File

@ -65,8 +65,6 @@ class DependencyCollector
def cache_key(spec) def cache_key(spec)
if spec.is_a?(Resource) && spec.download_strategy <= CurlDownloadStrategy if spec.is_a?(Resource) && spec.download_strategy <= CurlDownloadStrategy
File.extname(spec.url) File.extname(spec.url)
elsif spec.is_a?(UsesFromMacOSDependency)
"#{spec.name}-#{spec.bounds}"
else else
spec spec
end end