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

fix: svn update doesn't take url argument

Browse Source 
`svn up` doesn't take url argument; compare `svn help up` to `svn help checkout`
Apparently `svn up` can ignore this argument (not documented), but providing this
argument could confuse code readers into believing that changing the url will
switch the branch. It doesn't; the argument is ignored.

This fix was relayed to me, but I've studied it further before posting.
It is related to the bug where --HEAD installs reuse the wrong cache.
Reading the former code, one might hope that providing a changed URL would
have `svn up` change branches. It doesn't; the url was ignored.

Closes Homebrew/homebrew#7159.

Signed-off-by: Max Howell <max@methylblue.com>
This commit is contained in:
Dave Bayer 2011-08-21 04:55:40 -07:00 committed by Max Howell
parent 4743bc96e2
commit 79873bf44a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/download_strategy.rb
View File

@ -195,7 +195,7 @@ class SubversionDownloadStrategy <AbstractDownloadStrategy
def initialize url, name, version, specs def initialize url, name, version, specs
super super
@unique_token="#{name}--svn" unless name.to_s.empty? or name == '__UNKNOWN__' @unique_token="#{name}--svn" unless name.to_s.empty? or name == '__UNKNOWN__'
@unique_token += "--HEAD" if ARGV.include? '--HEAD' @unique_token += "-HEAD" if ARGV.include? '--HEAD'
@co=HOMEBREW_CACHE+@unique_token @co=HOMEBREW_CACHE+@unique_token
end end
@ -238,16 +238,14 @@ class SubversionDownloadStrategy <AbstractDownloadStrategy
end end
end end
def _fetch_command svncommand, url, target
[svn, svncommand, '--force', url, target]
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.exist? ? 'up' : 'checkout' svncommand = target.exist? ? 'up' : 'checkout'
args = _fetch_command svncommand, url, target args = [svn, svncommand, '--force']
args << url if !target.exist?
args << target
args << '-r' << revision if revision args << '-r' << revision if revision
args << '--ignore-externals' if ignore_externals args << '--ignore-externals' if ignore_externals
quiet_safe_system(*args) quiet_safe_system(*args)