From d86c4d7b7ac1f7aff4773dc1ba6eb8f0524622de Mon Sep 17 00:00:00 2001 From: Baffour Adu Boampong Date: Tue, 21 Jul 2020 17:09:53 +0000 Subject: [PATCH] Feedback changes and fix for pull_request join --- Library/Homebrew/dev-cmd/bump.rb | 8 +++++--- Library/Homebrew/diagnostic.rb | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump.rb b/Library/Homebrew/dev-cmd/bump.rb index 05dc7ffb8d..62f6bf02f5 100644 --- a/Library/Homebrew/dev-cmd/bump.rb +++ b/Library/Homebrew/dev-cmd/bump.rb @@ -39,8 +39,8 @@ module Homebrew next if repology_homebrew_repo.blank? latest_version = repositories.find { |repo| repo["status"] == "newest" }["version"] - - packages[repology_homebrew_repo["srcname"]] = format_package(repology_homebrew_repo["srcname"], latest_version) + srcname = repology_homebrew_repo["srcname"] + packages[srcname] = format_package(srcname, latest_version) end packages end @@ -54,12 +54,13 @@ module Homebrew 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) + pull_requests = pull_requests.join(", ") if pull_requests.try(:any?) { repology_latest_version: latest_version, current_formula_version: current_version.to_s, livecheck_latest_version: livecheck_response[:livecheck_version], - open_pull_requests: pull_requests.join(", "), + open_pull_requests: pull_requests, } end @@ -82,6 +83,7 @@ module Homebrew end def parse_livecheck_response(response) + # e.g response => aacgain : 7834 ==> 1.8 output = response.delete(" ").split(/:|==>/) # e.g. ["openclonk", "7.0", "8.1"] diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index c5832d9ecb..ed1014f888 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -671,9 +671,7 @@ module Homebrew next if status.blank? # these will result in uncommitted gems. - if path == HOMEBREW_REPOSITORY - next if ENV["HOMEBREW_SORBET"] || ENV["HOMEBREW_PATCHELF_RB"] - end + next if path == HOMEBREW_REPOSITORY && (ENV["HOMEBREW_SORBET"] || ENV["HOMEBREW_PATCHELF_RB"]) message ||= "" message += "\n" unless message.empty?