From 5d68f40d0edb45a0e4af11093ad0df26c893aa34 Mon Sep 17 00:00:00 2001 From: zt <1450026690@qq.com> Date: Wed, 2 Sep 2020 19:48:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E6=89=BE=E5=88=B0?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E5=8F=98=E9=87=8F=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E4=B8=BAnot=5Ffd=5Fcom,=E5=A2=9E=E5=BC=BA=E5=8F=AF=E8=AF=BB?= =?UTF-8?q?=E6=80=A7,=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/apps/package/function/searchdb.py | 6 ------ .../application/apps/package/function/self_depend.py | 12 ++++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/packageship/packageship/application/apps/package/function/searchdb.py b/packageship/packageship/application/apps/package/function/searchdb.py index cad4016a..abb04aca 100644 --- a/packageship/packageship/application/apps/package/function/searchdb.py +++ b/packageship/packageship/application/apps/package/function/searchdb.py @@ -225,8 +225,6 @@ class SearchDB(): return_tuple = namedtuple( 'return_tuple', 'subpack_name search_version search_name') for search_name in search_set: - # LOGGER.logger.warning("Can't not find " + - # search_name + " subpack in all database") result_list.append( (return_tuple(None, None, search_name), 'NOT_FOUND')) return ResponseCode.SUCCESS, result_list @@ -309,8 +307,6 @@ class SearchDB(): if not_found_binary: for key, values in not_found_binary.items(): - # LOGGER.logger.warning( - # "CANNOT FOUND THE component" + key + " in all database") for info in values: obj = return_tuple( info[0], @@ -372,8 +368,6 @@ class SearchDB(): if not not_found_binary: return result_list if not_found_binary: - # for key, values in not_found_binary.items(): - # LOGGER.logger.warning("CANNOT FOUND THE component" + key + " in all database") for key, values in not_found_binary.items(): for info in values: obj = return_tuple( diff --git a/packageship/packageship/application/apps/package/function/self_depend.py b/packageship/packageship/application/apps/package/function/self_depend.py index 538707a5..019626cc 100644 --- a/packageship/packageship/application/apps/package/function/self_depend.py +++ b/packageship/packageship/application/apps/package/function/self_depend.py @@ -131,10 +131,10 @@ class SelfDepend(): Raises: """ self.result_tmp.clear() - _, self.result_tmp, not_fd_install = \ + _, self.result_tmp, not_fd_com = \ install_depend(self.db_list).query_install_depend(self.search_install_list, self.binary_dict.dictionary) - self.not_found_components.update(not_fd_install) + self.not_found_components.update(not_fd_com) self.search_install_list.clear() for key, values in self.result_tmp.items(): if key in self.binary_dict.dictionary: @@ -201,13 +201,13 @@ class SelfDepend(): Returns: Raises: """ - _, self.result_tmp, _, not_fd_build = build_depend( + _, self.result_tmp, _, not_fd_com = build_depend( self.search_build_list, self.db_list, self_build=0, history_dict=self.binary_dict.dictionary ).build_depend_main() - self.not_found_components.update(not_fd_build) + self.not_found_components.update(not_fd_com) self.search_build_list.clear() for key, values in self.result_tmp.items(): if not key: @@ -233,13 +233,13 @@ class SelfDepend(): Args: Returns: """ - _, self.result_tmp, source_dicts_tmp, not_fd_build = build_depend( + _, self.result_tmp, source_dicts_tmp, not_fd_com = build_depend( self.search_build_list, self.db_list, self_build=1, history_dict=self.source_dicts.dictionary ).build_depend_main() - self.not_found_components.update(not_fd_build) + self.not_found_components.update(not_fd_com) for key, values in self.result_tmp.items(): if not key: LOGGER.logger.warning("key is NONE for value = " + str(values)) -- GitLab