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

download_strategy: style nits

Browse Source
This commit is contained in:
Jack Nagel 2013-10-09 21:41:14 -05:00
parent c790a4f45e
commit 3d7de0065b
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/download_strategy.rb
View File

@ -331,9 +331,10 @@ class SubversionDownloadStrategy < AbstractDownloadStrategy
@co.rmtree @co.rmtree
end end
if @ref_type == :revision case @ref_type
when :revision
fetch_repo @co, @url, @ref fetch_repo @co, @url, @ref
elsif @ref_type == :revisions when :revisions
# nil is OK for main_revision, as fetch_repo will then get latest # nil is OK for main_revision, as fetch_repo will then get latest
main_revision = @ref.delete :trunk main_revision = @ref.delete :trunk
fetch_repo @co, @url, main_revision, true fetch_repo @co, @url, main_revision, true
@ -429,7 +430,7 @@ class GitDownloadStrategy < AbstractDownloadStrategy
if @clone.exist? && repo_valid? if @clone.exist? && repo_valid?
puts "Updating #@clone" puts "Updating #@clone"
Dir.chdir(@clone) do @clone.cd do
config_repo config_repo
update_repo update_repo
checkout checkout
@ -447,7 +448,7 @@ class GitDownloadStrategy < AbstractDownloadStrategy
def stage def stage
dst = Dir.getwd dst = Dir.getwd
Dir.chdir @clone do @clone.cd do
if @ref_type and @ref if @ref_type and @ref
ohai "Checking out #@ref_type #@ref" ohai "Checking out #@ref_type #@ref"
else else
@ -579,13 +580,13 @@ class CVSDownloadStrategy < AbstractDownloadStrategy
mod, url = split_url(@url) mod, url = split_url(@url)
unless @co.exist? unless @co.exist?
Dir.chdir HOMEBREW_CACHE do HOMEBREW_CACHE.cd do
safe_system '/usr/bin/cvs', '-d', url, 'login' safe_system '/usr/bin/cvs', '-d', url, 'login'
safe_system '/usr/bin/cvs', '-d', url, 'checkout', '-d', checkout_name("cvs"), mod safe_system '/usr/bin/cvs', '-d', url, 'checkout', '-d', checkout_name("cvs"), mod
end end
else else
puts "Updating #{@co}" puts "Updating #{@co}"
Dir.chdir(@co) { safe_system '/usr/bin/cvs', 'up' } @co.cd { safe_system '/usr/bin/cvs', 'up' }
end end
end end
@ -655,7 +656,7 @@ class MercurialDownloadStrategy < AbstractDownloadStrategy
def stage def stage
dst = Dir.getwd dst = Dir.getwd
Dir.chdir @clone do @clone.cd do
if @ref_type and @ref if @ref_type and @ref
ohai "Checking out #{@ref_type} #{@ref}" ohai "Checking out #{@ref_type} #{@ref}"
safe_system hgpath, 'archive', '--subrepos', '-y', '-r', @ref, '-t', 'files', dst safe_system hgpath, 'archive', '--subrepos', '-y', '-r', @ref, '-t', 'files', dst