aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorJack Nagel2013-12-04 01:10:11 -0600
committerJack Nagel2013-12-04 01:19:17 -0600
commit36d3a2dfa8af985db438b9bd566a2b96a108051f (patch)
tree6149eb420a2c9dc43a46b190233a934ac4547d9e /Library/Homebrew
parent5537abbe511b10046adc26ee821d95a977a1efb6 (diff)
downloadbrew-36d3a2dfa8af985db438b9bd566a2b96a108051f.tar.bz2
Homebrew CVS is required for Xcode 5+
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/dependency_collector.rb2
-rw-r--r--Library/Homebrew/os/mac/xcode.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index e7aa89538..b3b1f52e1 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 de710728c..ae01d8878 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