From 0edb57d205d2cedde1f8c8c082ff56964846a67a Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Tue, 27 Sep 2022 11:32:51 -0500 Subject: [PATCH] Addon Manager: Error checking when Python can't be found --- .../AddonManager/manage_python_dependencies.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Mod/AddonManager/manage_python_dependencies.py b/src/Mod/AddonManager/manage_python_dependencies.py index 6dabba8a7a..8d0a7ce962 100644 --- a/src/Mod/AddonManager/manage_python_dependencies.py +++ b/src/Mod/AddonManager/manage_python_dependencies.py @@ -77,9 +77,9 @@ def call_pip(args) -> List[str]: python_exe = utils.get_python_exe() pip_failed = False if python_exe: + call_args = [python_exe, "-m", "pip", "--disable-pip-version-check"] + call_args.extend(args) try: - call_args = [python_exe, "-m", "pip", "--disable-pip-version-check"] - call_args.extend(args) proc = subprocess.run( call_args, stdout=subprocess.PIPE, @@ -101,15 +101,15 @@ def call_pip(args) -> List[str]: ) FreeCAD.Console.PrintLog(" ".join(call_args)) pip_failed = True - else: - pip_failed = True - result = [] - if not pip_failed: - data = proc.stdout.decode() - result = data.split("\n") + result = [] + if not pip_failed: + data = proc.stdout.decode() + result = data.split("\n") + else: + raise Exception(proc.stderr.decode()) else: - raise Exception(proc.stderr.decode()) + raise Exception("Could not locate Python executable on this system") return result