Merge pull request #37 from SummerGGift/master

 【修改】：BUG 修复以及代码更新

Author: armink

archive.py

@@ -29,10 +29,12 @@
 import pkgsdb
 
 
-def unpack(archive_fn, path, pkg):
+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:
@@ -66,7 +68,7 @@ def unpack(archive_fn, path, pkg):
                 # Gets the folder name and change_dirname only once
                 if flag:
                     dir_name = os.path.split(right_path)[0]
-                    change_dirname = dir_name + '-' + pkg['ver']
+                    change_dirname = pkgs_name_in_json + '-' + pkg['ver']
                     flag = False
 
                 right_name_to_db = right_path.replace(
@@ -76,9 +78,12 @@ def unpack(archive_fn, path, pkg):
         arch.close()
 
     #Change the folder name
+    
+    change_dirname = pkgs_name_in_json + '-' + pkg['ver']
     #print(os.path.join(path, dir_name))
-    #rint(os.path.join(path, change_dirname))
-
+    #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)

cmds/cmd_package.py

@@ -196,7 +196,10 @@ def install_pkg(env_root, bsp_root, pkg):
     #print "url:",package_url
     #print "url_from_json: ",url_from_json
     #print("==================================================>")
-
+    
+    get_package_url = None
+    get_ver_sha     = None
+    
     if os.path.isfile(env_config_file) and find_macro_in_condfig(env_config_file, 'SYS_PKGS_DOWNLOAD_ACCELERATE'):
         get_package_url, get_ver_sha = get_url_from_mirror_server(
             pkgs_name_in_json, pkg['ver'])
@@ -264,7 +267,7 @@ def install_pkg(env_root, bsp_root, pkg):
 
         # unpack package
         if not os.path.exists(pkg_dir):
-            package.unpack(pkg_fullpath, bsp_pkgs_path, pkg)
+            package.unpack(pkg_fullpath, bsp_pkgs_path, pkg, pkgs_name_in_json)
             ret = True
 
     return ret
@@ -440,22 +443,9 @@ def update_latest_packages(read_back_pkgs_json, bsp_packages_path):
                   (pkgs_name_in_json))
 
 
-def package_update():
-    """Update env's packages.
+def pre_package_update():
 
-    Compare the old and new software package list and update the package.
-    Remove unwanted packages and download the newly selected package.
-    Check if the files in the deleted packages have been changed, and if so, 
-    remind the user saved the modified file.
-    """
-    
     bsp_root = Import('bsp_root')
-    env_root = Import('env_root')
-
-    flag = True
-
-    #print bsp_root
-    #print env_root
 
     if not os.path.exists('.config'):
         print (
@@ -509,6 +499,30 @@ def package_update():
     with open(pkgs_fn, 'r') as f:
         oldpkgs = json.load(f)
 
+    return [oldpkgs, newpkgs, pkgs_fn, bsp_packages_path, dbsqlite_pathname]
+
+
+def package_update():
+    """Update env's packages.
+
+    Compare the old and new software package list and update the package.
+    Remove unwanted packages and download the newly selected package.
+    Check if the files in the deleted packages have been changed, and if so, 
+    remind the user saved the modified file.
+    """
+    
+    bsp_root = Import('bsp_root')
+    env_root = Import('env_root')
+
+    flag = True
+    
+    sys_value = pre_package_update()
+    oldpkgs = sys_value[0]
+    newpkgs = sys_value[1]
+    pkgs_fn = sys_value[2]
+    bsp_packages_path = sys_value[3]
+    dbsqlite_pathname = sys_value[4]
+
     #print "newpkgs:",newpkgs
     #print "oldpkgs:",oldpkgs
 

package.py

@@ -220,9 +220,9 @@ def download(self, ver, path, url_from_srv):
                     return False
         return ret
 
-    def unpack(self, fullpkg_path, path, pkg):
+    def unpack(self, fullpkg_path, path, pkg, pkgs_name_in_json):
         try:
-            archive.unpack(fullpkg_path, path, pkg)
+            archive.unpack(fullpkg_path, path, pkg, pkgs_name_in_json)
         except Exception, e:
             print('e.message:%s\t' % e.message)
             print('unpack %s failed' % os.path.basename(fullpkg_path))