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

diagnostic: fix xattr check

Browse Source 
Python emits the version on either stderr or stdout based on major
version, so just to be safe let's use popen_read and combine the
output streams.
This commit is contained in:
Jonathan Chang 2020-09-21 01:15:31 +10:00
parent f6cd7b72f4
commit 08059680f0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/diagnostic.rb
View File

@ -968,9 +968,9 @@ module Homebrew
return if result.status.success?
if result.stderr.include? "ImportError: No module named pkg_resources"
result = system_command "/usr/bin/python", "--version"
result = Utils.popen_read "/usr/bin/python", "--version", err: :out
if result.stdout.include? "Python 2.7"
if result.include? "Python 2.7"
<<~EOS
Your Python installation has a broken version of setuptools.
To fix, reinstall macOS or run 'sudo /usr/bin/python -m pip install -I setuptools'.