diff -Naru pkgship-1.1.0/packageship/application/apps/package/function/build_depend.py pkg/packageship/application/apps/package/function/build_depend.py --- pkgship-1.1.0/packageship/application/apps/package/function/build_depend.py 2020-10-13 13:57:13.529049796 +0800 +++ pkg/packageship/application/apps/package/function/build_depend.py 2020-10-13 13:58:37.670278333 +0800 @@ -89,9 +89,9 @@ build_list, not_fd_com_build, pk_v - ) = self.search_db.get_build_depend(pkg_list, self.__already_pk_val) + ) = 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 @@ code, res_dict, not_fd_com_install = \ InstallDepend(self.db_list).query_install_depend(search_list, - self.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 @@ -206,8 +206,8 @@ not_fd_com, pk_v ) = self.search_db.get_build_depend(pkg_name_li, - self.__already_pk_val) - self.__already_pk_val += pk_v + pk_value=self.__already_pk_val) + self.__already_pk_val = pk_v self.not_found_components.update(not_fd_com) if not bin_info_lis: return diff -Naru pkgship-1.1.0/packageship/application/apps/package/function/install_depend.py pkg/packageship/application/apps/package/function/install_depend.py --- pkgship-1.1.0/packageship/application/apps/package/function/install_depend.py 2020-10-13 13:57:13.529049796 +0800 +++ pkg/packageship/application/apps/package/function/install_depend.py 2020-10-13 13:58:37.680278477 +0800 @@ -68,7 +68,7 @@ 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 @@ response_code: response code Raises: """ - result_list, not_found_components, pk_val = map( - set, - self.__search_db.get_install_depend(self.__search_list, - 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 -Naru pkgship-1.1.0/packageship/application/apps/package/function/searchdb.py pkg/packageship/application/apps/package/function/searchdb.py --- pkgship-1.1.0/packageship/application/apps/package/function/searchdb.py 2020-10-13 13:57:13.529049796 +0800 +++ pkg/packageship/application/apps/package/function/searchdb.py 2020-10-13 13:58:37.680278477 +0800 @@ -94,7 +94,7 @@ for db_name, data_base in self.db_object_dict.items(): try: - req_set = self._get_requires(search_set, data_base, _tp='install') + req_set = self._get_requires(search_set, data_base, search_type='install') if not req_set: continue @@ -104,7 +104,7 @@ pk_v, not_fd_com) = self._get_provides_req_info(req_set, data_base, - pk_val) + pk_value=pk_val) pk_val += pk_v res_list, get_list = self._comb_install_list(depend_set, req_pk_dict, @@ -121,7 +121,7 @@ if not search_set: result_list.extend( self._get_install_pro_in_other_database(provides_not_found, - db_name) + database_name=db_name) ) return result_list, set(provides_not_found.keys()), pk_val @@ -215,13 +215,13 @@ return ret_list, get_list - def _get_install_pro_in_other_database(self, not_found_binary, _db_name=None): + def _get_install_pro_in_other_database(self, not_found_binary, database_name=None): """ Description: Binary package name data not found in the current database, go to other databases to try Args: not_found_binary: not_found_build These data cannot be found in the current database - _db_name:current database name + database_name:current database name Returns: result_list :[return_tuple1,return_tuple2] package information Raises: @@ -242,7 +242,7 @@ search_set = {k for k, _ in not_found_binary.items()} for db_name, data_base in self.db_object_dict.items(): - if db_name == _db_name: + if db_name == database_name: continue parm_tuple = namedtuple("in_tuple", 'req_name') @@ -362,7 +362,7 @@ for db_name, data_base in self.db_object_dict.items(): try: - req_set = self._get_requires(s_name_set, data_base, _tp='build') + req_set = self._get_requires(s_name_set, data_base, search_type='build') if not req_set: continue @@ -384,7 +384,7 @@ s_name_set.symmetric_difference_update(set(get_list)) if not s_name_set: build_list.extend( - self._get_binary_in_other_database(provides_not_found, _db_name=db_name) + self._get_binary_in_other_database(provides_not_found, database_name=db_name) ) return ResponseCode.SUCCESS, build_list, set(provides_not_found.keys()), pk_val @@ -483,13 +483,13 @@ return ret_list, get_list - def _get_binary_in_other_database(self, not_found_binary, _db_name=None): + def _get_binary_in_other_database(self, not_found_binary, database_name=None): """ Description: Binary package name data not found in the current database, go to other databases to try Args: not_found_binary: not_found_build These data cannot be found in the current database - _db_name:current database name + database_name:current database name Returns: result_list :[return_tuple1,return_tuple2] package information Raises: @@ -513,7 +513,7 @@ for db_name, data_base in self.db_object_dict.items(): - if db_name == _db_name: + if db_name == database_name: continue in_tuple = namedtuple("in_tuple", 'req_name') @@ -600,20 +600,20 @@ # Common methods for install and build @staticmethod - def _get_requires(search_set, data_base, _tp=None): + def _get_requires(search_set, data_base, search_type=None): """ Description: Query the dependent components of the current package Args: search_set: The package name to be queried data_base:current database object - _tp:type options build or install + search_type: type options build or install Returns: req_set:List Package information and corresponding component information Raises: AttributeError: The object does not have this property SQLAlchemyError: sqlalchemy error """ - if _tp == 'build': + if search_type == 'build': sql_com = text(""" SELECT DISTINCT src_requires.NAME AS req_name, @@ -623,7 +623,7 @@ ( SELECT pkgKey, NAME, version, src_name FROM src_pack WHERE {} ) src LEFT JOIN src_requires ON src.pkgKey = src_requires.pkgKey; """.format(literal_column('name').in_(search_set))) - elif _tp == 'install': + elif search_type == 'install': sql_com = text(""" SELECT DISTINCT bin_requires.NAME AS req_name, diff -Naru pkgship-1.1.0/packageship/application/apps/package/function/self_depend.py pkg/packageship/application/apps/package/function/self_depend.py --- pkgship-1.1.0/packageship/application/apps/package/function/self_depend.py 2020-10-13 13:57:13.529049796 +0800 +++ pkg/packageship/application/apps/package/function/self_depend.py 2020-10-13 13:58:37.690278620 +0800 @@ -143,7 +143,7 @@ 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():