From b435db807dd6f089c4e151d94a9528db010fa099 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Fri, 1 Apr 2022 11:49:47 -0500 Subject: [PATCH] Addon Manager: Optional packages also obey allowlist --- src/Mod/AddonManager/AddonManager.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Mod/AddonManager/AddonManager.py b/src/Mod/AddonManager/AddonManager.py index 148ec58067..efdd1cbd1b 100644 --- a/src/Mod/AddonManager/AddonManager.py +++ b/src/Mod/AddonManager/AddonManager.py @@ -982,7 +982,15 @@ class CommandAddonManager: try: __import__(py_dep) except ImportError: - self.python_optional.append(py_dep) + allowed = False + for dep in python_required: + if dep in self.allowed_packages: + allowed = True + break + if allowed: + self.python_optional.append(py_dep) + else: + FreeCAD.Console.PrintWarning(translate("AddonsInstaller", "Specified optional package {} is not in the allowed packages list").format(py_dep)) self.wbs.sort() self.external_addons.sort()