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

bump-formula-pr: handle gnu mirrors

Browse Source 
and add explicit version when not preexisting
This commit is contained in:
ilovezfs 2016-09-04 11:21:08 -07:00
parent a9a62972bd
commit 394b0884eb
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -109,7 +109,13 @@ module Homebrew
elsif !hash_type elsif !hash_type
odie "#{formula}: no tag/revision specified!" odie "#{formula}: no tag/revision specified!"
else else
rsrc = Resource.new { @url = new_url } rsrc_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
end
rsrc = Resource.new { @url = rsrc_url }
rsrc.download_strategy = CurlDownloadStrategy rsrc.download_strategy = CurlDownloadStrategy
rsrc.owner = Resource.new(formula.name) rsrc.owner = Resource.new(formula.name)
rsrc_path = rsrc.fetch rsrc_path = rsrc.fetch
@ -157,7 +163,15 @@ module Homebrew
end end
if forced_version && forced_version != "0" if forced_version && forced_version != "0"
replacement_pairs << [old_formula_version, forced_version] if File.read(formula.path).include?("version \"#{old_formula_version}\"")
replacement_pairs << [old_formula_version.to_s, forced_version]
else
if new_mirror
replacement_pairs << [/^( +)(mirror \"#{new_mirror}\"\n)/m, "\\1\\2\\1version \"#{forced_version}\"\n"]
else
replacement_pairs << [/^( +)(url \"#{new_url}\"\n)/m, "\\1\\2\\1version \"#{forced_version}\"\n"]
end
end
elsif forced_version && forced_version == "0" elsif forced_version && forced_version == "0"
replacement_pairs << [/^ version \"[a-z\d+\.]+\"\n/m, ""] replacement_pairs << [/^ version \"[a-z\d+\.]+\"\n/m, ""]
end end