提交 5d68f40d 编写于 作者: Z zt

修改未找到组件的变量名字为not_fd_com,增强可读性,删除多余注释内容

上级 3e92a0d9
...@@ -225,8 +225,6 @@ class SearchDB(): ...@@ -225,8 +225,6 @@ class SearchDB():
return_tuple = namedtuple( return_tuple = namedtuple(
'return_tuple', 'subpack_name search_version search_name') 'return_tuple', 'subpack_name search_version search_name')
for search_name in search_set: for search_name in search_set:
# LOGGER.logger.warning("Can't not find " +
# search_name + " subpack in all database")
result_list.append( result_list.append(
(return_tuple(None, None, search_name), 'NOT_FOUND')) (return_tuple(None, None, search_name), 'NOT_FOUND'))
return ResponseCode.SUCCESS, result_list return ResponseCode.SUCCESS, result_list
...@@ -309,8 +307,6 @@ class SearchDB(): ...@@ -309,8 +307,6 @@ class SearchDB():
if not_found_binary: if not_found_binary:
for key, values in not_found_binary.items(): for key, values in not_found_binary.items():
# LOGGER.logger.warning(
# "CANNOT FOUND THE component" + key + " in all database")
for info in values: for info in values:
obj = return_tuple( obj = return_tuple(
info[0], info[0],
...@@ -372,8 +368,6 @@ class SearchDB(): ...@@ -372,8 +368,6 @@ class SearchDB():
if not not_found_binary: if not not_found_binary:
return result_list return result_list
if not_found_binary: 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 key, values in not_found_binary.items():
for info in values: for info in values:
obj = return_tuple( obj = return_tuple(
......
...@@ -131,10 +131,10 @@ class SelfDepend(): ...@@ -131,10 +131,10 @@ class SelfDepend():
Raises: Raises:
""" """
self.result_tmp.clear() 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, install_depend(self.db_list).query_install_depend(self.search_install_list,
self.binary_dict.dictionary) 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() self.search_install_list.clear()
for key, values in self.result_tmp.items(): for key, values in self.result_tmp.items():
if key in self.binary_dict.dictionary: if key in self.binary_dict.dictionary:
...@@ -201,13 +201,13 @@ class SelfDepend(): ...@@ -201,13 +201,13 @@ class SelfDepend():
Returns: Returns:
Raises: Raises:
""" """
_, self.result_tmp, _, not_fd_build = build_depend( _, self.result_tmp, _, not_fd_com = build_depend(
self.search_build_list, self.search_build_list,
self.db_list, self.db_list,
self_build=0, self_build=0,
history_dict=self.binary_dict.dictionary history_dict=self.binary_dict.dictionary
).build_depend_main() ).build_depend_main()
self.not_found_components.update(not_fd_build) self.not_found_components.update(not_fd_com)
self.search_build_list.clear() self.search_build_list.clear()
for key, values in self.result_tmp.items(): for key, values in self.result_tmp.items():
if not key: if not key:
...@@ -233,13 +233,13 @@ class SelfDepend(): ...@@ -233,13 +233,13 @@ class SelfDepend():
Args: Args:
Returns: 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.search_build_list,
self.db_list, self.db_list,
self_build=1, self_build=1,
history_dict=self.source_dicts.dictionary history_dict=self.source_dicts.dictionary
).build_depend_main() ).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(): for key, values in self.result_tmp.items():
if not key: if not key:
LOGGER.logger.warning("key is NONE for value = " + str(values)) LOGGER.logger.warning("key is NONE for value = " + str(values))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册