From f46bcfd287a8a3016fa8c995d08c467bdc84a330 Mon Sep 17 00:00:00 2001
From: zt <1450026690@qq.com>
Date: Sat, 19 Sep 2020 18:26:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9subpack=5Fname?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9A=84=E5=AD=98=E5=9C=A8=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?,=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E7=BC=A9=E8=BF=9B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98,=E5=B9=B6=E5=87=8F=E5=B0=91=E6=97=A7?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9A=84=E5=88=A4=E6=96=AD=E5=88=86=E6=94=AF?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/package/function/self_depend.py      | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/packageship/packageship/application/apps/package/function/self_depend.py b/packageship/packageship/application/apps/package/function/self_depend.py
index 1ec4c282..b06b9504 100644
--- a/packageship/packageship/application/apps/package/function/self_depend.py
+++ b/packageship/packageship/application/apps/package/function/self_depend.py
@@ -106,16 +106,20 @@ class SelfDepend():
         """
         if packtype == 'source':
             response_code, subpack_list = self.search_db.get_sub_pack([packname])
-            if subpack_list:
-                for subpack_tuple, dbname in subpack_list:
-                    self.source_dicts.append_src(packname, dbname, subpack_tuple.search_version)
-                    if dbname != 'NOT FOUND':
-                        self.binary_dict.append_bin(key=subpack_tuple.subpack_name,
-                                                    src=packname,
-                                                    version=subpack_tuple.search_version,
-                                                    dbname=dbname)
-                    else:
-                        return ResponseCode.PACK_NAME_NOT_FOUND
+            if not subpack_list:
+                return ResponseCode.PACK_NAME_NOT_FOUND
+
+            for subpack_tuple, dbname in subpack_list:
+                self.source_dicts.append_src(packname, dbname, subpack_tuple.search_version)
+                if dbname == 'NOT FOUND':
+                    continue
+
+                if subpack_tuple.subpack_name and subpack_tuple.subpack_name \
+                        not in self.binary_dict.dictionary:
+                    self.binary_dict.append_bin(key=subpack_tuple.subpack_name,
+                                                src=packname,
+                                                version=subpack_tuple.search_version,
+                                                dbname=dbname)
 
         else:
             response_code, dbname, source_name, version = \
@@ -178,15 +182,17 @@ class SelfDepend():
             self.search_subpack_list.remove(None)
         _, result_list = self.search_db.get_sub_pack(self.search_subpack_list)
         for subpack_tuple, dbname in result_list:
-            if dbname != 'NOT FOUND':
-                if subpack_tuple.subpack_name and subpack_tuple.subpack_name \
-                        not in self.binary_dict.dictionary:
-                    self.binary_dict.append_bin(key=subpack_tuple.subpack_name,
-                                                src=subpack_tuple.search_name,
-                                                version=subpack_tuple.sub_pack_version,
-                                                dbname=dbname,
-                                                parent_node=[subpack_tuple.search_name, 'Subpack'])
-                    self.search_install_list.append(subpack_tuple.subpack_name)
+            if dbname == 'NOT FOUND':
+                continue
+
+            if subpack_tuple.subpack_name and subpack_tuple.subpack_name \
+                    not in self.binary_dict.dictionary:
+                self.binary_dict.append_bin(key=subpack_tuple.subpack_name,
+                                            src=subpack_tuple.search_name,
+                                            version=subpack_tuple.sub_pack_version,
+                                            dbname=dbname,
+                                            parent_node=[subpack_tuple.search_name, 'Subpack'])
+                self.search_install_list.append(subpack_tuple.subpack_name)
         self.search_subpack_list.clear()
 
     def query_build(self, selfbuild):
-- 
Gitee