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

bump-formula-pr: restore formula if duplicate PR exists

Browse Source
This commit is contained in:
Seeker 2020-07-15 14:54:39 -07:00
parent ce16de65ea
commit 79d4b27c86
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,7 +316,7 @@ module Homebrew
new_formula_version = formula_version(formula, requested_spec, new_contents) new_formula_version = formula_version(formula, requested_spec, new_contents)
check_for_duplicate_pull_requests(formula, tap_full_name, new_formula_version.to_s) check_for_duplicate_pull_requests(formula, backup_file, tap_full_name, new_formula_version.to_s)
if !new_mirrors && !formula_spec.mirrors.empty? if !new_mirrors && !formula_spec.mirrors.empty?
if args.force? if args.force?
@ -481,7 +481,7 @@ module Homebrew
[] []
end end
def check_for_duplicate_pull_requests(formula, tap_full_name, version) def check_for_duplicate_pull_requests(formula, backup_file, tap_full_name, version)
# check for open requests # check for open requests
pull_requests = fetch_pull_requests(formula.name, tap_full_name, state: "open") pull_requests = fetch_pull_requests(formula.name, tap_full_name, state: "open")
@ -497,8 +497,10 @@ module Homebrew
if args.force? && !args.quiet? if args.force? && !args.quiet?
opoo duplicates_message opoo duplicates_message
elsif !args.force? && args.quiet? elsif !args.force? && args.quiet?
formula.path.atomic_write(backup_file) unless args.dry_run?
odie error_message odie error_message
elsif !args.force? elsif !args.force?
formula.path.atomic_write(backup_file) unless args.dry_run?
odie <<~EOS odie <<~EOS
#{duplicates_message.chomp} #{duplicates_message.chomp}
#{error_message} #{error_message}