From 36c7a3f27fb15a346d6238eb2a0da9d25a2070ab Mon Sep 17 00:00:00 2001 From: Seeker Date: Thu, 30 Jul 2020 17:09:59 -0700 Subject: [PATCH] bump-formula-pr, utils/pypi: tweak log messages --- Library/Homebrew/dev-cmd/bump-formula-pr.rb | 3 +-- Library/Homebrew/utils/pypi.rb | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 48d21ec625..1f97daa305 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -333,9 +333,8 @@ module Homebrew alias_rename.map! { |a| formula.tap.alias_dir/a } end - ohai "brew update-python-resources #{formula.name}" unless read_only_run - PyPI.update_python_resources! formula, new_formula_version, silent: true, ignore_non_pypi_packages: true + PyPI.update_python_resources! formula, new_formula_version, silent: args.quiet?, ignore_non_pypi_packages: true end run_audit(formula, alias_rename, old_contents, args: args) diff --git a/Library/Homebrew/utils/pypi.rb b/Library/Homebrew/utils/pypi.rb index 960584dc5c..3295db7c64 100644 --- a/Library/Homebrew/utils/pypi.rb +++ b/Library/Homebrew/utils/pypi.rb @@ -82,7 +82,7 @@ module PyPI @pipgrip_installed ||= Formula["pipgrip"].any_version_installed? odie '"pipgrip" must be installed (`brew install pipgrip`)' unless @pipgrip_installed - ohai "Retrieving PyPI dependencies for \"#{pypi_name}==#{version}\"" if !print_only && !silent + ohai "Retrieving PyPI dependencies for \"#{pypi_name}==#{version}\"..." if !print_only && !silent pipgrip_output = Utils.popen_read Formula["pipgrip"].bin/"pipgrip", "--json", "--no-cache-dir", "#{pypi_name}==#{version}" unless $CHILD_STATUS.success? @@ -103,6 +103,7 @@ module PyPI new_resource_blocks = "" packages.each do |package, package_version| + ohai "Getting PyPI info for \"#{package}==#{package_version}\"" if !print_only && !silent name, url, checksum = get_pypi_info package, package_version # Fail if unable to find name, url or checksum for any resource if name.blank?