From e46fbdd18d7e3f39350073debeca1d59487e1af1 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Wed, 24 Jan 2018 06:49:31 -0800 Subject: [PATCH] bump-formula-pr: update GNU mirror handling. homebrew/core now uses ftp.gnu.org/gnu for the primary url and ftpmirror.gnu.org for the mirror. --- Library/Homebrew/dev-cmd/bump-formula-pr.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 334269a0ae..e536d03be3 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -191,13 +191,10 @@ module Homebrew elsif !new_url odie "#{formula}: no --url= argument specified!" else - resource_url = if requested_spec != :devel && new_url =~ /.*ftpmirror.gnu.*/ - new_mirror = new_url.sub "ftpmirror.gnu.org", "ftp.gnu.org/gnu" - new_mirror - else - new_url + new_mirror = if requested_spec != :devel && new_url =~ %r{.*ftp.gnu.org/gnu.*} + new_url.sub "ftp.gnu.org/gnu", "ftpmirror.gnu.org" end - resource = Resource.new { @url = resource_url } + resource = Resource.new { @url = new_url } resource.download_strategy = CurlDownloadStrategy resource.owner = Resource.new(formula.name) resource.version = forced_version if forced_version