Merge pull request #63 from RT-Thread/develop

Develop

Author: armink

archive.py

@@ -33,17 +33,14 @@ def unpack(archive_fn, path, pkg, pkgs_name_in_json):
 
     flag = True
 
-    #print(pkg)
-    
     if ".tar.bz2" in archive_fn:
         arch = tarfile.open(archive_fn, "r:bz2")
         for tarinfo in arch:
             arch.extract(tarinfo, path)
             a = tarinfo.name
             if not os.path.isdir(os.path.join(path, a)):
                 right_path = a.replace('/', '\\')
-                a = os.path.join(os.path.split(right_path)[
-                                 0], os.path.split(right_path)[1])
+                a = os.path.join(os.path.split(right_path)[0], os.path.split(right_path)[1])
                 pkgsdb.savetodb(a, archive_fn)
         arch.close()
 
@@ -54,8 +51,7 @@ def unpack(archive_fn, path, pkg, pkgs_name_in_json):
             a = tarinfo.name
             if not os.path.isdir(os.path.join(path, a)):
                 right_path = a.replace('/', '\\')
-                a = os.path.join(os.path.split(right_path)[
-                                 0], os.path.split(right_path)[1])
+                a = os.path.join(os.path.split(right_path)[0], os.path.split(right_path)[1])
                 pkgsdb.savetodb(a, archive_fn)
         arch.close()
 
@@ -71,19 +67,14 @@ def unpack(archive_fn, path, pkg, pkgs_name_in_json):
                     change_dirname = pkgs_name_in_json + '-' + pkg['ver']
                     flag = False
 
-                right_name_to_db = right_path.replace(
-                    dir_name, change_dirname, 1)
-                #print(right_name_to_db)
+                right_name_to_db = right_path.replace(dir_name, change_dirname, 1)
                 pkgsdb.savetodb(right_name_to_db, archive_fn, right_path)
         arch.close()
 
-    #Change the folder name
+    # Change the folder name
 
     change_dirname = pkgs_name_in_json + '-' + pkg['ver']
-    #print(os.path.join(path, dir_name))
-    #print(os.path.join(path, change_dirname))
-    #print(pkgs_name_in_json)
-    
+
     if os.path.isdir(os.path.join(path, change_dirname)):
         cmd = 'rd /s /q ' + os.path.join(path, change_dirname)
         os.system(cmd)
@@ -96,28 +87,32 @@ def packtest(path):
     if ".zip" in path:
         try:
             if zipfile.is_zipfile(path):
-            # test zip again to make sure it's a right zip file.
+                # Test zip again to make sure it's a right zip file.
                 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)
-            arch.close()
+            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):
-                ret = False                    
+                ret = False
         except Exception, e:
             ret = False
 
     if ".tar.gz" in path:
         try:
             if not tarfile.is_tarfile(path):
-                ret = False                    
+                ret = False
         except Exception, e:
             ret = False
-                    
+
     return ret

cmds/cmd_package.py

@@ -32,6 +32,7 @@
 import subprocess
 import time
 import logging
+import archive
 import sys
 
 try:
@@ -334,20 +335,24 @@ 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):
+            return False
+     
         # unpack package
         if not os.path.exists(pkg_dir):
-            package.unpack(pkg_fullpath, bsp_pkgs_path, pkg, pkgs_name_in_json)
-            ret = True
+            try:
+                if not package.unpack(pkg_fullpath, bsp_pkgs_path, pkg, pkgs_name_in_json):
+                    ret = False
+            except Exception, e:
+                os.remove(pkg_fullpath)
+                ret = False
+                print('e.message: %s\t' % e.message)
 
     return ret
 
@@ -625,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)
@@ -634,8 +639,8 @@ 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." %
-                   pkg['name'], pkg['ver'])
+            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)
             read_back_pkgs_json = write_back_pkgs_json

package.py

@@ -223,7 +223,11 @@ def download(self, ver, path, url_from_srv):
 
     def unpack(self, fullpkg_path, path, pkg, pkgs_name_in_json):
         try:
+            # ignore the return value
             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