aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorilovezfs2018-01-24 06:49:31 -0800
committerilovezfs2018-01-28 08:10:53 -0800
commite46fbdd18d7e3f39350073debeca1d59487e1af1 (patch)
tree9d2686771209161b11f56c9ec5178086bfebb800
parent99bb068ca734c7096bf82c72730f1babc7f72431 (diff)
downloadbrew-e46fbdd18d7e3f39350073debeca1d59487e1af1.tar.bz2
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.
-rw-r--r--Library/Homebrew/dev-cmd/bump-formula-pr.rb9
1 files 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 334269a0a..e536d03be 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