Merge commit '3371e5145480ff968c1d4bc3543e5705c91d8d89'

# Conflicts:
#	cmds/cmd_package.py

Author: SummerGift

cmds/cmd_package.py

@@ -501,47 +501,6 @@ def pre_package_update():
 
     return [oldpkgs, newpkgs, pkgs_fn, bsp_packages_path, dbsqlite_pathname]
 
-def error_packages_handle(error_packages_list, read_back_pkgs_json, pkgs_fn):
-    bsp_root = Import('bsp_root')
-    env_root = Import('env_root')
-    
-    flag = None
-    
-    error_packages_redownload_error_list = []
-    
-    if len(error_packages_list):
-        print("\n==============================> Error packages list :  \n")
-        for pkg in error_packages_list:
-            print pkg['name'], pkg['ver']
-        print("\nThe package in the list above is accidentally deleted.")
-        print("Env will redownload packages that have been accidentally deleted.")
-        print("If you really want to remove these packages, do that in the menuconfig command.\n")
-
-        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" % (
-                    pkg['name'], pkg['ver']))
-            else:
-                error_packages_redownload_error_list.append(pkg)
-                print pkg, 'download failed.'
-                flag = False
-
-        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'])
-            write_back_pkgs_json = sub_list(
-                read_back_pkgs_json, error_packages_redownload_error_list)
-            read_back_pkgs_json = write_back_pkgs_json
-            #print("write_back_pkgs_json:%s"%write_back_pkgs_json)
-            pkgs_file = file(pkgs_fn, 'w')
-            pkgs_file.write(json.dumps(write_back_pkgs_json, indent=1))
-            pkgs_file.close()
-    else:
-        print("\nAll the selected packages have been downloaded successfully.\n")
-    
-    return flag
-
 
 def package_update():
     """Update env's packages.
@@ -668,7 +627,7 @@ def package_update():
     #print(read_back_pkgs_json)
 
     error_packages_list = []
-
+    error_packages_redownload_error_list = []
     for pkg in read_back_pkgs_json:
         dirpath = pkg['path']
         ver = pkg['ver']
@@ -678,11 +637,11 @@ def package_update():
 
         dirpath = os.path.basename(dirpath)
         removepath = os.path.join(bsp_packages_path, dirpath)
-        #print("if floder exist : %s"%removepath)
+        
         git_removepath = get_pkg_folder_by_orign_path(removepath, ver)
-        #print("if floder exist : %s"%git_removepath) 
+        #print "if floder exist",removepath
         removepath_ver = get_pkg_folder_by_orign_path(removepath, ver[1:])
-        #print("if floder exist : %s"%removepath_ver) 
+        #print "if floder exist",removepath
 
         if os.path.exists(removepath):
             continue
@@ -693,13 +652,42 @@ def package_update():
         else:
             error_packages_list.append(pkg)
 
-    get_flag = error_packages_handle(error_packages_list, read_back_pkgs_json, pkgs_fn)
-    
-    if get_flag != None:
-        flag = get_flag
-        
-    update_latest_packages(read_back_pkgs_json, bsp_packages_path)
-    
+    if len(error_packages_list):
+        print("\n==============================> Error packages list :  \n")
+        for pkg in error_packages_list:
+            print pkg['name'], pkg['ver']
+        print("\nThe package in the list above is accidentally deleted.")
+        print("Env will redownload packages that have been accidentally deleted.")
+        print("If you really want to remove these packages, do that in the menuconfig command.\n")
+
+        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" % (
+                    pkg['name'], pkg['ver']))
+            else:
+                error_packages_redownload_error_list.append(pkg)
+                print pkg, 'download failed.'
+                flag = False
+
+        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'])
+            write_back_pkgs_json = sub_list(
+                read_back_pkgs_json, error_packages_redownload_error_list)
+            read_back_pkgs_json = write_back_pkgs_json
+            #print("write_back_pkgs_json:%s"%write_back_pkgs_json)
+            pkgs_file = file(pkgs_fn, 'w')
+            pkgs_file.write(json.dumps(write_back_pkgs_json, indent=1))
+            pkgs_file.close()
+    else:
+        print("\nAll the selected packages have been downloaded successfully.\n")
+
+    try:
+        update_latest_packages(read_back_pkgs_json, bsp_packages_path)
+    except KeyboardInterrupt:
+        flag = 0
+
     if flag:
         print ("Operation completed successfully.")
     else: