Brew style fix
This commit is contained in:
parent
e3361360f1
commit
076b4dd89f
@ -314,26 +314,7 @@ module Homebrew
|
|||||||
|
|
||||||
new_formula_version = formula_version(formula, requested_spec, new_contents)
|
new_formula_version = formula_version(formula, requested_spec, new_contents)
|
||||||
|
|
||||||
pull_requests = GitHub.check_for_duplicate_pull_requests(formula, tap_full_name, new_formula_version.to_s)
|
check_duplicate_pull_requests(formula, tap_full_name, new_formula_version.to_s)
|
||||||
|
|
||||||
duplicates_message = <<~EOS
|
|
||||||
These pull requests may be duplicates:
|
|
||||||
#{pull_requests.join("\n")}
|
|
||||||
EOS
|
|
||||||
error_message = "Duplicate PRs should not be opened. Use --force to override this error."
|
|
||||||
|
|
||||||
if !pull_requests.blank?
|
|
||||||
if args.force? && !args.quiet?
|
|
||||||
opoo duplicates_message
|
|
||||||
elsif !args.force? && args.quiet?
|
|
||||||
odie error_message
|
|
||||||
elsif !args.force?
|
|
||||||
odie <<~EOS
|
|
||||||
#{duplicates_message.chomp}
|
|
||||||
#{error_message}
|
|
||||||
EOS
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if !new_mirrors && !formula_spec.mirrors.empty?
|
if !new_mirrors && !formula_spec.mirrors.empty?
|
||||||
if args.force?
|
if args.force?
|
||||||
@ -451,6 +432,28 @@ module Homebrew
|
|||||||
[remote_url, username]
|
[remote_url, username]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def check_duplicate_pull_requests(formula, tap_full_name, new_formula_version)
|
||||||
|
pull_requests = GitHub.check_for_duplicate_pull_requests(formula, tap_full_name, new_formula_version)
|
||||||
|
return if pull_requests.blank?
|
||||||
|
|
||||||
|
duplicates_message = <<~EOS
|
||||||
|
These pull requests may be duplicates:
|
||||||
|
#{pull_requests.join("\n")}
|
||||||
|
EOS
|
||||||
|
error_message = "Duplicate PRs should not be opened. Use --force to override this error."
|
||||||
|
|
||||||
|
if args.force? && !args.quiet?
|
||||||
|
opoo duplicates_message
|
||||||
|
elsif !args.force? && args.quiet?
|
||||||
|
odie error_message
|
||||||
|
elsif !args.force?
|
||||||
|
odie <<~EOS
|
||||||
|
#{duplicates_message.chomp}
|
||||||
|
#{error_message}
|
||||||
|
EOS
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def inreplace_pairs(path, replacement_pairs)
|
def inreplace_pairs(path, replacement_pairs)
|
||||||
if args.dry_run?
|
if args.dry_run?
|
||||||
contents = path.open("r") { |f| Formulary.ensure_utf8_encoding(f).read }
|
contents = path.open("r") { |f| Formulary.ensure_utf8_encoding(f).read }
|
||||||
|
Loading…
x
Reference in New Issue
Block a user