From afe4d854025cf2f5cb15e46cb5e9451b9026ab26 Mon Sep 17 00:00:00 2001 From: zt <1450026690@qq.com> Date: Mon, 12 Oct 2020 17:21:31 +0800 Subject: [PATCH] =?UTF-8?q?bugfix=20=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/package/function/build_depend.py | 8 ++++---- .../apps/package/function/install_depend.py | 13 +++++-------- .../apps/package/function/self_depend.py | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/packageship/packageship/application/apps/package/function/build_depend.py b/packageship/packageship/application/apps/package/function/build_depend.py index f4d63b75..bb087108 100644 --- a/packageship/packageship/application/apps/package/function/build_depend.py +++ b/packageship/packageship/application/apps/package/function/build_depend.py @@ -91,7 +91,7 @@ class BuildDepend(): pk_v ) = self.search_db.get_build_depend(pkg_list, pk_value=self.__already_pk_val) - self.__already_pk_val += pk_v + self.__already_pk_val = pk_v self.not_found_components.update(not_fd_com_build) if not build_list: return res_status if res_status == ResponseCode.DIS_CONNECTION_DB else \ @@ -102,8 +102,8 @@ class BuildDepend(): code, res_dict, not_fd_com_install = \ InstallDepend(self.db_list).query_install_depend(search_list, - history_pk_val=self.history_dicts, - history_dicts=self.__already_pk_val) + history_pk_val=self.__already_pk_val, + history_dicts=self.history_dicts) self.not_found_components.update(not_fd_com_install) if not res_dict: return code @@ -207,7 +207,7 @@ class BuildDepend(): pk_v ) = self.search_db.get_build_depend(pkg_name_li, pk_value=self.__already_pk_val) - self.__already_pk_val += pk_v + self.__already_pk_val = pk_v self.not_found_components.update(not_fd_com) if not bin_info_lis: return diff --git a/packageship/packageship/application/apps/package/function/install_depend.py b/packageship/packageship/application/apps/package/function/install_depend.py index 3d2bc78a..70967693 100644 --- a/packageship/packageship/application/apps/package/function/install_depend.py +++ b/packageship/packageship/application/apps/package/function/install_depend.py @@ -68,7 +68,7 @@ class InstallDepend(): self.__search_list.append(binary) else: LOGGER.logger.warning("There is a NONE in input value: %s", str(binary_list)) - self.__already_pk_value += history_pk_val if history_pk_val else [] + self.__already_pk_value = history_pk_val if history_pk_val else [] while self.__search_list: self.__query_single_install_dep(history_dicts) return ResponseCode.SUCCESS, self.binary_dict.dictionary, self.not_found_components @@ -82,14 +82,11 @@ class InstallDepend(): response_code: response code Raises: """ - result_list, not_found_components, pk_val = map( - set, - self.__search_db.get_install_depend(self.__search_list, - pk_value=self.__already_pk_value) - ) - + res_list, not_found_components, pk_val = self.__search_db.get_install_depend(self.__search_list, + pk_value=self.__already_pk_value) + result_list = set(res_list) self.not_found_components.update(not_found_components) - self.__already_pk_value += pk_val + self.__already_pk_value = pk_val for search in self.__search_list: if search not in self.binary_dict.dictionary: self.binary_dict.init_key(key=search, parent_node=[]) diff --git a/packageship/packageship/application/apps/package/function/self_depend.py b/packageship/packageship/application/apps/package/function/self_depend.py index b06b9504..f6f42e08 100644 --- a/packageship/packageship/application/apps/package/function/self_depend.py +++ b/packageship/packageship/application/apps/package/function/self_depend.py @@ -143,7 +143,7 @@ class SelfDepend(): self.result_tmp.clear() _, self.result_tmp, not_fd_com = \ install_depend(self.db_list).query_install_depend(self.search_install_list, - self.binary_dict.dictionary) + history_dicts=self.binary_dict.dictionary) self.not_found_components.update(not_fd_com) self.search_install_list.clear() for key, values in self.result_tmp.items(): -- Gitee