admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Simplify UnsafeSubversionDownloadStrategy

Browse Source
This commit is contained in:
Jack Nagel 2014-10-07 21:33:15 -05:00
parent cb862901ea
commit 09b7f40b25
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/Homebrew/download_strategy.rb
View File

@ -405,12 +405,16 @@ class SubversionDownloadStrategy < VCSDownloadStrategy
end end
end end
def fetch_args
[]
end
def fetch_repo target, url, revision=nil, ignore_externals=false def fetch_repo target, url, revision=nil, ignore_externals=false
# Use "svn up" when the repository already exists locally. # Use "svn up" when the repository already exists locally.
# This saves on bandwidth and will have a similar effect to verifying the # This saves on bandwidth and will have a similar effect to verifying the
# cache as it will make any changes to get the right revision. # cache as it will make any changes to get the right revision.
svncommand = target.directory? ? 'up' : 'checkout' svncommand = target.directory? ? 'up' : 'checkout'
args = ['svn', svncommand] args = ['svn', svncommand] + fetch_args
# SVN shipped with XCode 3.1.4 can't force a checkout. # SVN shipped with XCode 3.1.4 can't force a checkout.
args << '--force' unless MacOS.version == :leopard args << '--force' unless MacOS.version == :leopard
args << url unless target.directory? args << url unless target.directory?
@ -425,17 +429,8 @@ StrictSubversionDownloadStrategy = SubversionDownloadStrategy
# Download from SVN servers with invalid or self-signed certs # Download from SVN servers with invalid or self-signed certs
class UnsafeSubversionDownloadStrategy < SubversionDownloadStrategy class UnsafeSubversionDownloadStrategy < SubversionDownloadStrategy
def fetch_repo target, url, revision=nil, ignore_externals=false def fetch_args
# Use "svn up" when the repository already exists locally. %w[--non-interactive --trust-server-cert]
# This saves on bandwidth and will have a similar effect to verifying the
# cache as it will make any changes to get the right revision.
svncommand = target.directory? ? 'up' : 'checkout'
args = ['svn', svncommand, '--non-interactive', '--trust-server-cert', '--force']
args << url unless target.directory?
args << target
args << '-r' << revision if revision
args << '--ignore-externals' if ignore_externals
quiet_safe_system(*args)
end end
end end