From c101a82c5b48917c0002b69a08e6e02e31c587e1 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 26 Jun 2018 07:10:36 +0100 Subject: [PATCH] Revert "Fix SVN downloads of versioned formula by munging directory names" --- Library/Homebrew/download_strategy.rb | 4 ---- Library/Homebrew/resource.rb | 12 +----------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index d8fa33f7b3..fe34008a17 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -665,10 +665,6 @@ class SubversionDownloadStrategy < VCSDownloadStrategy @url = @url.sub("svn+http://", "") end - def cache_filename - Resource.safe_download_name("#{name}--#{cache_tag}") - end - def fetch clear_cache unless @url.chomp("/") == repo_url || quiet_system("svn", "switch", @url, cached_location) super diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb index 12519bb98d..3dda50f8df 100644 --- a/Library/Homebrew/resource.rb +++ b/Library/Homebrew/resource.rb @@ -66,18 +66,8 @@ class Resource name.tr("/", "-") 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 - raw_name = if name - "#{owner.name}--#{escaped_name}" - else - owner.name - end - Resource.safe_download_name(raw_name) + name.nil? ? owner.name : "#{owner.name}--#{escaped_name}" end def cached_download