From 79d4b27c8645692cc8b0c9014c71ed440c2f20d9 Mon Sep 17 00:00:00 2001 From: Seeker Date: Wed, 15 Jul 2020 14:54:39 -0700 Subject: [PATCH] bump-formula-pr: restore formula if duplicate PR exists --- Library/Homebrew/dev-cmd/bump-formula-pr.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 4418d66d15ad0..851fd32c82660 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -316,7 +316,7 @@ def bump_formula_pr 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 args.force? @@ -481,7 +481,7 @@ def fetch_pull_requests(query, tap_full_name, state: nil) [] 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 pull_requests = fetch_pull_requests(formula.name, tap_full_name, state: "open") @@ -497,8 +497,10 @@ def check_for_duplicate_pull_requests(formula, tap_full_name, version) if args.force? && !args.quiet? opoo duplicates_message elsif !args.force? && args.quiet? + formula.path.atomic_write(backup_file) unless args.dry_run? odie error_message elsif !args.force? + formula.path.atomic_write(backup_file) unless args.dry_run? odie <<~EOS #{duplicates_message.chomp} #{error_message}