Skip to content

change python version check order in shim and handler #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2023
Merged

change python version check order in shim and handler #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/extension/src/MsftLinuxPatchExtShim.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function find_python(){
local python_exec_command=$1

# Check if there is python defined.
for p in python python2 python3 /usr/libexec/platform-python; do
for p in python3 python python2 /usr/libexec/platform-python; do
if command -v "${p}" ; then
eval ${python_exec_command}=${p}
return
Expand Down
10 changes: 5 additions & 5 deletions src/extension/src/ProcessHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,16 +132,16 @@ def get_python_cmd(self):
command_to_use_for_python = "python"
command_to_use_for_python3 = "python3"

# check if the machine contains python
code_returned_for_python_check, output_for_python_check = self.env_layer.run_command_output(command_to_check_for_python, False, False)
if code_returned_for_python_check == 0 and command_to_use_for_python in str(output_for_python_check) and command_to_use_for_python3 not in str(output_for_python_check):
return command_to_use_for_python

# check if the machine contains python3
code_returned_for_python3_check, output_for_python3_check = self.env_layer.run_command_output(command_to_check_for_python3, False, False)
if code_returned_for_python3_check == 0 and command_to_use_for_python3 in str(output_for_python3_check):
return command_to_use_for_python3

# check if the machine contains python
code_returned_for_python_check, output_for_python_check = self.env_layer.run_command_output(command_to_check_for_python, False, False)
if code_returned_for_python_check == 0 and command_to_use_for_python in str(output_for_python_check) and command_to_use_for_python3 not in str(output_for_python_check):
return command_to_use_for_python

return Constants.PYTHON_NOT_FOUND

def __check_process_state(self, process, seq_no):
Expand Down