diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 3da2fdc7e1..0744334108 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -314,7 +314,7 @@ module Homebrew new_formula_version = formula_version(formula, requested_spec, new_contents) - GitHub.check_for_duplicate_pull_requests(formula, tap_full_name, new_formula_version.to_s, args) + GitHub.check_for_duplicate_pull_requests(formula, tap_full_name, new_formula_version.to_s) if !new_mirrors && !formula_spec.mirrors.empty? if args.force? diff --git a/Library/Homebrew/dev-cmd/bump.rb b/Library/Homebrew/dev-cmd/bump.rb index b277eba964..d6b6909c55 100644 --- a/Library/Homebrew/dev-cmd/bump.rb +++ b/Library/Homebrew/dev-cmd/bump.rb @@ -53,7 +53,7 @@ module Homebrew tap_full_name = formula.tap&.full_name current_version = current_formula_version(formula) livecheck_response = livecheck_formula(package_name) - pull_requests = GitHub.check_for_duplicate_pull_requests(formula, tap_full_name, latest_version, args, true) + pull_requests = GitHub.check_for_duplicate_pull_requests(formula, tap_full_name, latest_version, true) { repology_latest_version: latest_version, diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb index f4ce5f7e3c..f40dba7fd3 100644 --- a/Library/Homebrew/utils/github.rb +++ b/Library/Homebrew/utils/github.rb @@ -356,7 +356,7 @@ module GitHub [] end - def check_for_duplicate_pull_requests(formula, tap_full_name, version, args, fetch_pr = false) + def check_for_duplicate_pull_requests(formula, tap_full_name, version, fetch_pr = false) # check for open requests pull_requests = fetch_pull_requests(formula.name, tap_full_name, state: "open") @@ -371,11 +371,11 @@ module GitHub #{pull_requests.map { |pr| "#{pr["title"]} #{pr["html_url"]}" }.join("\n")} EOS error_message = "Duplicate PRs should not be opened. Use --force to override this error." - if args.force? && !args.quiet? + if Homebrew.args.force? && !Homebrew.args.quiet? opoo duplicates_message - elsif !args.force? && args.quiet? + elsif !Homebrew.args.force? && Homebrew.args.quiet? odie error_message - elsif !args.force? + elsif !Homebrew.args.force? odie <<~EOS #{duplicates_message.chomp} #{error_message}