Merge pull request ceph#65934 from tchaikov/cephadm-detect-pip

tchaikov · web-flow · commit cb92ff2fc24c · 2025-10-15T06:51:51.000+08:00
cephadm/build: Fix _has_python_pip() function check

Reviewed-by: John Mulligan &lt;jmulligan@redhat.com&gt;
diff --git a/src/cephadm/build.py b/src/cephadm/build.py
@@ -423,7 +423,7 @@ def _has_python_venv(executable):
 
 def _has_python_pip(executable):
     res = _run(
-        [executable, '-m', 'venv', '--help'], stdout=subprocess.DEVNULL
+        [executable, '-m', 'pip', '--help'], stdout=subprocess.DEVNULL
     )
     return res.returncode == 0
 

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ def _has_python_venv(executable):`
`423`	`423`
`424`	`424`	`def _has_python_pip(executable):`
`425`	`425`	`res = _run(`
`426`		`- [executable, '-m', 'venv', '--help'], stdout=subprocess.DEVNULL`
	`426`	`+ [executable, '-m', 'pip', '--help'], stdout=subprocess.DEVNULL`
`427`	`427`	`)`
`428`	`428`	`return res.returncode == 0`
`429`	`429`