diff options
| -rwxr-xr-x | Library/ENV/scm/git | 7 | ||||
| -rw-r--r-- | Library/Formula/mplayer.rb | 3 | ||||
| -rw-r--r-- | Library/Homebrew/download_strategy.rb | 18 |
3 files changed, 4 insertions, 24 deletions
diff --git a/Library/ENV/scm/git b/Library/ENV/scm/git index 888a6ff11..e4d36b583 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/Formula/mplayer.rb b/Library/Formula/mplayer.rb index 0495faf72..d99d11106 100644 --- a/Library/Formula/mplayer.rb +++ b/Library/Formula/mplayer.rb @@ -22,7 +22,8 @@ class Mplayer < Formula end head do - url "svn://svn.mplayerhq.hu/mplayer/trunk", :using => StrictSubversionDownloadStrategy + url "svn://svn.mplayerhq.hu/mplayer/trunk" + depends_on "subversion" => :build if MacOS.version <= :leopard # When building SVN, configure prompts the user to pull FFmpeg from git. # Don't do that. diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index e6ce3729f..30f1489d6 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 |