From 4ab83fec44da4d40f79c7e00a9e43636ef2fd01d Mon Sep 17 00:00:00 2001 From: jpyoung3 <809608046@qq.com> Date: Wed, 25 Dec 2024 17:27:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=89=E8=A3=85=E9=A2=84=E8=AE=BE?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E9=94=81=E5=AE=9A=E7=89=88=E6=9C=AC=20(close?= =?UTF-8?q?d=20#2482)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/backend/subscription/steps/adapter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/backend/subscription/steps/adapter.py b/apps/backend/subscription/steps/adapter.py index 2dc93241c..6c31910f5 100644 --- a/apps/backend/subscription/steps/adapter.py +++ b/apps/backend/subscription/steps/adapter.py @@ -481,7 +481,7 @@ def get_matching_config_tmpl_objs( self, os_type: str, cpu_arch: str, package: models.Packages = None, config: Dict = None ) -> List[models.PluginConfigTemplate]: """如果 package 是重新获取的(包括业务锁定版本和tag不存在的版本两种情况)，则重新从数据库中获取配置模板""" - if not self.is_pkg_in_selected_pkg(package, self.selected_pkg_infos): + if package is not None and not self.is_pkg_in_selected_pkgs(package, self.selected_pkg_infos): plugin_config_templates = [] for config_template in config["config_templates"]: config_tmpl = ( @@ -548,7 +548,7 @@ def plugin_version_config(): return plugin_version_config @staticmethod - def is_pkg_in_selected_pkg(package: models.Packages, selected_pkg_infos: List[Dict]) -> bool: + def is_pkg_in_selected_pkgs(package: models.Packages, selected_pkg_infos: List[Dict]) -> bool: for pkg_info in selected_pkg_infos: if ( package.project == pkg_info["project"]