Skip to content

Commit 55b22ea

Browse files
authored
Merge pull request #4 from SummerGGift/optimize
【修改】:完善提示信息都修改为 .encode("utf-8"),避免出现错误
2 parents 8dcd672 + 150b66d commit 55b22ea

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

cmds/cmd_package.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,7 @@ def get_url_from_mirror_server(pkgs_name_in_json, pkgs_ver):
164164
# Can't find package,change git package SHA if it's a git
165165
# package
166166
if len(package_info['packages']) == 0:
167-
print(
168-
"Package was NOT found on mirror server. Using a non-mirrored address to download.")
167+
print("Package was NOT found on mirror server. Using a non-mirrored address to download.")
169168
return None, None
170169
else:
171170
for item in package_info['packages'][0]['packages_info']['site']:
@@ -209,8 +208,8 @@ def determine_url_valid(url_from_srv):
209208
return True
210209

211210
except Exception, e:
212-
# print('e.message:%s\t' % e.message)
213-
print('Network connection error or the url : %s is invalid.\n' % url_from_srv)
211+
# print('e.message:%s\t' % e.message)
212+
print('Network connection error or the url : %s is invalid.\n' % url_from_srv.encode("utf-8"))
214213

215214

216215
def install_pkg(env_root, bsp_root, pkg):
@@ -491,7 +490,7 @@ def update_latest_packages(pkgs_fn, bsp_packages_path):
491490
git_cmd_exec(cmd, repo_path)
492491
else:
493492
print("Can't find the package : %s's url in file : %s" %
494-
(payload_pkgs_name_in_json, pkg_path))
493+
(payload_pkgs_name_in_json.encode("utf-8"), pkg_path.encode("utf-8")))
495494

496495
print("==============================> %s update done \n" %
497496
(pkgs_name_in_json.encode("utf-8")))
@@ -638,7 +637,7 @@ def rm_package(dir):
638637
os.system(cmd)
639638

640639
if os.path.isdir(dir):
641-
print ("Folder path: %s" % dir)
640+
print ("Folder path: %s" % dir.encode("utf-8"))
642641
return False
643642
else:
644643
print ("Path: %s \nSuccess: Folder has been removed. " % dir.encode("utf-8"))
@@ -734,10 +733,10 @@ def package_update(isDeleteOld=False):
734733

735734
if os.path.isdir(removepath_ver):
736735
print("\nError: %s package delete failed, begin to remove it."%
737-
error_package['name'])
736+
error_package['name'].encode("utf-8"))
738737

739738
if rm_package(removepath_ver) == False:
740-
print("Error: Delete package %s failed! Please delete the folder manually.\n"%error_package['name'])
739+
print("Error: Delete package %s failed! Please delete the folder manually.\n"%error_package['name'].encode("utf-8"))
741740
return
742741

743742
# 1.in old ,not in new : Software packages that need to be removed.
@@ -756,7 +755,7 @@ def package_update(isDeleteOld=False):
756755
print ("\nStart to remove %s \nplease wait..." % gitdir.encode("utf-8"))
757756
if isDeleteOld:
758757
if rm_package(gitdir) == False:
759-
print("Floder delete fail: %s" % gitdir)
758+
print("Floder delete fail: %s" % gitdir.encode("utf-8"))
760759
print("Please delete this folder manually.")
761760
else:
762761
print (
@@ -770,7 +769,7 @@ def package_update(isDeleteOld=False):
770769
print("Error: Please delete the folder manually.")
771770
except Exception, e:
772771
print('Error message:%s%s. error.message: %s\n\t' %
773-
("Delete folder failed: ", gitdir, e.message))
772+
("Delete folder failed: ", gitdir.encode("utf-8"), e.message))
774773
else:
775774
if os.path.isdir(removepath_ver):
776775
print("Start to remove %s \nplease wait..." % removepath_ver.encode("utf-8"))
@@ -779,7 +778,7 @@ def package_update(isDeleteOld=False):
779778
except Exception, e:
780779
pkgs_delete_fail_list.append(pkg)
781780
print('Error message:\n%s %s. %s \n\t' % (
782-
"Delete folder failed, please delete the folder manually", removepath_ver, e.message))
781+
"Delete folder failed, please delete the folder manually", removepath_ver.encode("utf-8"), e.message))
783782

784783
if len(pkgs_delete_fail_list):
785784
# write error messages
@@ -970,7 +969,7 @@ def upgrade_packages_index():
970969
if not os.path.isdir(pkgs_path):
971970
cmd = 'git clone ' + git_repo + ' ' + pkgs_path
972971
os.system(cmd)
973-
print ("upgrade from :%s" % (git_repo))
972+
print ("upgrade from :%s" % (git_repo.encode("utf-8")))
974973
else:
975974
print("Begin to upgrade env packages.")
976975
cmd = r'git pull ' + git_repo

0 commit comments

Comments
 (0)