From dbbc14040d7acc94ca6e40c39ca60b38aa1419b0 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Tue, 18 Aug 2020 12:13:44 +0200 Subject: [PATCH] extend/os/mac: install svn on catalina and newer --- Library/Homebrew/extend/os/mac/dependency_collector.rb | 4 +++- Library/Homebrew/test/os/mac/dependency_collector_spec.rb | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/dependency_collector.rb b/Library/Homebrew/extend/os/mac/dependency_collector.rb index 11c58bbe76..5db3b5767a 100644 --- a/Library/Homebrew/extend/os/mac/dependency_collector.rb +++ b/Library/Homebrew/extend/os/mac/dependency_collector.rb @@ -6,7 +6,9 @@ class DependencyCollector def git_dep_if_needed(tags); end - def subversion_dep_if_needed(tags); end + def subversion_dep_if_needed(tags) + Dependency.new("subversion", tags) if MacOS.version >= :catalina + end def cvs_dep_if_needed(tags) Dependency.new("cvs", tags) diff --git a/Library/Homebrew/test/os/mac/dependency_collector_spec.rb b/Library/Homebrew/test/os/mac/dependency_collector_spec.rb index ab2c9287d0..eacaf971fc 100644 --- a/Library/Homebrew/test/os/mac/dependency_collector_spec.rb +++ b/Library/Homebrew/test/os/mac/dependency_collector_spec.rb @@ -32,6 +32,10 @@ describe DependencyCollector do specify "Resource dependency from a Subversion URL" do resource = Resource.new resource.url("svn://brew.sh/foo/bar") - expect(subject.add(resource)).to be nil + if MacOS.version < :catalina + expect(subject.add(resource)).to be nil + else + expect(subject.add(resource)).not_to be nil + end end end