From 5dd1092f5f7e8651ace6d6986039b8cc8f9b7e21 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 5 Oct 2014 20:15:18 -0500 Subject: [PATCH] Remove last usage of StrictSubversionDownloadStrategy This strategy is only used in one formula, so we can just replace it with a dependency. It could be done with a requirement, but since this is a low-impact change (it only matters for head builds on Leopard), I'm not sure it's worth the effort. The constant is retained for compatibility, though I could find only one other reference to it on GitHub, in a formula that was removed from core almost two years ago. --- Library/ENV/scm/git | 7 +------ Library/Homebrew/download_strategy.rb | 18 +----------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/Library/ENV/scm/git b/Library/ENV/scm/git index 888a6ff11d..e4d36b5835 100755 --- a/Library/ENV/scm/git +++ b/Library/ENV/scm/git @@ -15,12 +15,7 @@ def exec *args return if arg0 =~ /^#{F}/i return if File.expand_path(arg0) == File.expand_path(__FILE__) - if args[1] == '-print-path' and File.executable? args[0] - puts args[0] - exit 0 - else - Kernel.exec *args - end + Kernel.exec(*args) end case F.downcase diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index e6ce3729f1..30f1489d68 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -421,23 +421,7 @@ class SubversionDownloadStrategy < VCSDownloadStrategy end end -# Require a newer version of Subversion than 1.4.x (Leopard-provided version) -class StrictSubversionDownloadStrategy < SubversionDownloadStrategy - def find_svn - exe = `svn -print-path` - `#{exe} --version` =~ /version (\d+\.\d+(\.\d+)*)/ - svn_version = $1 - version_tuple=svn_version.split(".").collect {|v|Integer(v)} - - if version_tuple[0] == 1 and version_tuple[1] <= 4 - onoe "Detected Subversion (#{exe}, version #{svn_version}) is too old." - puts "Subversion 1.4.x will not export externals correctly for this formula." - puts "You must either `brew install subversion` or set HOMEBREW_SVN to the path" - puts "of a newer svn binary." - end - return exe - end -end +StrictSubversionDownloadStrategy = SubversionDownloadStrategy # Download from SVN servers with invalid or self-signed certs class UnsafeSubversionDownloadStrategy < SubversionDownloadStrategy