【完善】：当软件包连不上网络或者更新出现错误时完善提示信息

Author: SummerGift

cmds/cmd_package.py

@@ -262,10 +262,9 @@ def install_pkg(env_root, bsp_root, pkg):
                     ver_sha = get_ver_sha
 
                 upstream_change_flag = True
-
     except Exception, e:
         # print('e.message:%s\t' % e.message)
-        print("Failed to obtain mirror url, package will be downloaded from non-mirror server.")
+        print("Failed to connect to the mirror server, package will be downloaded from non-mirror server.")
 
     if package_url[-4:] == '.git':
 
@@ -459,18 +458,22 @@ def update_latest_packages(pkgs_fn, bsp_packages_path):
             repo_path = os.path.join(bsp_packages_path, pkgs_name_in_json)
             repo_path = get_pkg_folder_by_orign_path(repo_path, pkg['ver'])
 
-            # If mirror acceleration is enabled, get the update address from
-            # the mirror server.
-            if os.path.isfile(env_config_file) and find_macro_in_config(env_config_file, 'SYS_PKGS_DOWNLOAD_ACCELERATE'):
-                payload_pkgs_name_in_json = pkgs_name_in_json.encode("utf-8")
+            try:
+                # If mirror acceleration is enabled, get the update address from
+                # the mirror server.
+                if os.path.isfile(env_config_file) and find_macro_in_config(env_config_file, 'SYS_PKGS_DOWNLOAD_ACCELERATE'):
+                    payload_pkgs_name_in_json = pkgs_name_in_json.encode("utf-8")
 
-                # Change repo's upstream address.
-                mirror_url = get_url_from_mirror_server(
-                    payload_pkgs_name_in_json, pkg['ver'])
+                    # Change repo's upstream address.
+                    mirror_url = get_url_from_mirror_server(
+                        payload_pkgs_name_in_json, pkg['ver'])
 
-                if mirror_url[0] != None:
-                    cmd = 'git remote set-url origin ' + mirror_url[0]
-                    git_cmd_exec(cmd, repo_path)
+                    if mirror_url[0] != None:
+                        cmd = 'git remote set-url origin ' + mirror_url[0]
+                        git_cmd_exec(cmd, repo_path)
+
+            except Exception, e:
+                print("Failed to connect to the mirror server, using non-mirror server to update.")
 
             # Update the package repository from upstream.
             cmd = 'git pull'

package.py

@@ -230,10 +230,10 @@ def download(self, ver, path, url_from_srv):
                         break
             except Exception, e:
                 #print url_from_srv
-                print('e.message:%s\t' % e.message)
+                # print('e.message:%s\t' % e.message)
                 retryCount = retryCount + 1
                 if retryCount > 5:
-                    print('%s download fail!' % path)
+                    print('%s download fail!\n' % path.decode("gbk").encode("utf-8"))
                     if os.path.isfile(path):
                         os.remove(path)
                     return False