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

bump-formula-pr, utils/pypi: tweak log messages

Browse Source
This commit is contained in:
Seeker 2020-07-30 17:09:59 -07:00
parent c5d3a4a0ed
commit 36c7a3f27f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,9 +333,8 @@ module Homebrew
alias_rename.map! { |a| formula.tap.alias_dir/a } alias_rename.map! { |a| formula.tap.alias_dir/a }
end end
ohai "brew update-python-resources #{formula.name}"
unless read_only_run 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 end
run_audit(formula, alias_rename, old_contents, args: args) run_audit(formula, alias_rename, old_contents, args: args)

3
Library/Homebrew/utils/pypi.rb
View File

@ -82,7 +82,7 @@ module PyPI
@pipgrip_installed ||= Formula["pipgrip"].any_version_installed? @pipgrip_installed ||= Formula["pipgrip"].any_version_installed?
odie '"pipgrip" must be installed (`brew install pipgrip`)' unless @pipgrip_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", pipgrip_output = Utils.popen_read Formula["pipgrip"].bin/"pipgrip", "--json", "--no-cache-dir",
"#{pypi_name}==#{version}" "#{pypi_name}==#{version}"
unless $CHILD_STATUS.success? unless $CHILD_STATUS.success?
@ -103,6 +103,7 @@ module PyPI
new_resource_blocks = "" new_resource_blocks = ""
packages.each do |package, package_version| 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 name, url, checksum = get_pypi_info package, package_version
# Fail if unable to find name, url or checksum for any resource # Fail if unable to find name, url or checksum for any resource
if name.blank? if name.blank?