From 36d3a2dfa8af985db438b9bd566a2b96a108051f Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 4 Dec 2013 01:10:11 -0600 Subject: [PATCH] Homebrew CVS is required for Xcode 5+ --- Library/Homebrew/dependency_collector.rb | 2 +- Library/Homebrew/os/mac/xcode.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb index e7aa895382..b3b1f52e1e 100644 --- a/Library/Homebrew/dependency_collector.rb +++ b/Library/Homebrew/dependency_collector.rb @@ -166,7 +166,7 @@ class DependencyCollector when strategy <= BazaarDownloadStrategy Dependency.new("bazaar", tags) when strategy <= CVSDownloadStrategy - Dependency.new("cvs", tags) if MacOS.version >= :mavericks + Dependency.new("cvs", tags) unless MacOS::Xcode.provides_cvs? when strategy < AbstractDownloadStrategy # allow unknown strategies to pass through else diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index de710728c9..ae01d88780 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -150,6 +150,10 @@ module OS version < "4.3" end + def provides_cvs? + version < "5.0" + end + def default_prefix? if version < "4.3" %r{^/Developer} === prefix