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

Merge pull request #4376 from Homebrew/revert-4358-fix-subversion-download-of-versioned-formulae

Browse Source 
Revert "Fix SVN downloads of versioned formula by munging directory names"
This commit is contained in:
Mike McQuaid 2018-06-26 07:11:02 +01:00 committed by GitHub
commit a75a8c69b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/download_strategy.rb
View File

@ -665,10 +665,6 @@ class SubversionDownloadStrategy < VCSDownloadStrategy
@url = @url.sub("svn+http://", "") @url = @url.sub("svn+http://", "")
end end
def cache_filename
Resource.safe_download_name("#{name}--#{cache_tag}")
end
def fetch def fetch
clear_cache unless @url.chomp("/") == repo_url || quiet_system("svn", "switch", @url, cached_location) clear_cache unless @url.chomp("/") == repo_url || quiet_system("svn", "switch", @url, cached_location)
super super

12
Library/Homebrew/resource.rb
View File

@ -66,18 +66,8 @@ class Resource
name.tr("/", "-") name.tr("/", "-")
end end
def self.safe_download_name(str)
# "@" is a special character for Subversion. Keep it out of the cache dir name.
str.gsub("@", "-AT-")
end
def download_name def download_name
raw_name = if name name.nil? ? owner.name : "#{owner.name}--#{escaped_name}"
"#{owner.name}--#{escaped_name}"
else
owner.name
end
Resource.safe_download_name(raw_name)
end end
def cached_download def cached_download