From b12f714a447d37b8930c0220ce47b1ca9bb2a272 Mon Sep 17 00:00:00 2001 From: Dustin Rodrigues Date: Mon, 17 Jul 2023 21:50:26 -0400 Subject: [PATCH] utils/pypi: don't overwrite name/extras/version from basic_metadata if already set --- Library/Homebrew/utils/pypi.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/utils/pypi.rb b/Library/Homebrew/utils/pypi.rb index 846a39048c..d833c1a809 100644 --- a/Library/Homebrew/utils/pypi.rb +++ b/Library/Homebrew/utils/pypi.rb @@ -127,9 +127,9 @@ module PyPI match = File.basename(@package_string).match(/^(.+)-([a-z\d.]+?)(?:.tar.gz|.zip)$/) raise ArgumentError, "Package should be a valid PyPI URL" if match.blank? - @name = PyPI.normalize_python_package match[1] - @extras = [] - @version = match[2] + @name ||= PyPI.normalize_python_package match[1] + @extras ||= [] + @version ||= match[2] elsif @is_url ensure_formula_installed!("python") @@ -152,9 +152,9 @@ module PyPI metadata = JSON.parse(pip_output)["install"].first["metadata"] - @name = PyPI.normalize_python_package metadata["name"] - @extras = [] - @version = metadata["version"] + @name ||= PyPI.normalize_python_package metadata["name"] + @extras ||= [] + @version ||= metadata["version"] else if @package_string.include? "==" name, version = @package_string.split("==") @@ -170,9 +170,9 @@ module PyPI extras = [] end - @name = PyPI.normalize_python_package name - @extras = extras - @version = version + @name ||= PyPI.normalize_python_package name + @extras ||= extras + @version ||= version end end end