【修改】：无法检测出错误压缩包的逻辑错误

Author: SummerGift

archive.py

@@ -100,12 +100,16 @@ def packtest(path):
                 arch = zipfile.ZipFile(path, "r")
                 if arch.testzip():
                     ret = False
-                arch.close()                    
+                arch.close()
+            else:
+                ret = False
+                print('package check error. \n')
         except Exception, e:
-            print('e.message:%s\t'%e.message)
+            print('packtest e.message:%s\t'%e.message)
 #             arch.close()
+            print("The archive package is broken. \n")
             ret = False
-                
+
     if ".tar.bz2" in path:
         try:
             if not tarfile.is_tarfile(path):

cmds/cmd_package.py

@@ -335,21 +335,15 @@ def install_pkg(env_root, bsp_root, pkg):
     else:
         # Download a package of compressed package type.
         if not package.download(pkg['ver'], local_pkgs_path, package_url):
-            ret = False
-            return ret
+            return False
 
         pkg_dir = package.get_filename(pkg['ver'])
         pkg_dir = os.path.splitext(pkg_dir)[0]
+        pkg_fullpath = os.path.join(local_pkgs_path, package.get_filename(pkg['ver']))
 
-        pkg_fullpath = os.path.join(
-            local_pkgs_path, package.get_filename(pkg['ver']))
-        #print("pkg_fullpath: %s"%pkg_fullpath)
-        
         if not archive.packtest(pkg_fullpath):
-            print("The archive package is broken.")
-            ret = False
-            return ret
-             
+            return False
+     
         # unpack package
         if not os.path.exists(pkg_dir):
             try:
@@ -636,7 +630,7 @@ def error_packages_handle(error_packages_list, read_back_pkgs_json, pkgs_fn):
 
         for pkg in error_packages_list:                # Redownloaded the packages in error_packages_list
             if install_pkg(env_root, bsp_root, pkg):
-                print("==============================>  %s %s is redownloaded successfully. \n" % (
+                print("==============================> %s %s is redownloaded successfully. \n" % (
                     pkg['name'], pkg['ver']))
             else:
                 error_packages_redownload_error_list.append(pkg)
@@ -645,7 +639,7 @@ def error_packages_handle(error_packages_list, read_back_pkgs_json, pkgs_fn):
 
         if len(error_packages_redownload_error_list):
             print("%s" % error_packages_redownload_error_list)
-            print ("Packages:%s,%s redownloed error,you need to use <pkgs --update> command again to redownload them." %
+            print ("Packages:%s,%s redownloed error, you need to use <pkgs --update> command again to redownload them." %
                    (pkg['name'], pkg['ver']))
             write_back_pkgs_json = sub_list(
                 read_back_pkgs_json, error_packages_redownload_error_list)

package.py

@@ -227,7 +227,7 @@ def unpack(self, fullpkg_path, path, pkg, pkgs_name_in_json):
             archive.unpack(fullpkg_path, path, pkg, pkgs_name_in_json)
             return True
         except Exception, e:
-            print('e.message:%s\t' % e.message)
+            print('unpack e.message:%s\t' % e.message)
             print('unpack %s failed' % os.path.basename(fullpkg_path))
             os.remove(fullpkg_path)
             return False