Skip to content

Commit 6be14fe

Browse files
committed
【完善】:删除过程逻辑
1 parent 077a540 commit 6be14fe

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

cmds/cmd_package.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -612,10 +612,10 @@ def rm_package(dir):
612612
os.system(cmd)
613613

614614
if os.path.isdir(dir):
615-
print ("Error : Delete folder failed!!! Folder path: %s." % dir)
615+
print ("Error : Delete folder failed!!! Folder path: %s" % dir)
616616
return False
617617
else:
618-
print ("Folder has been removed.")
618+
print ("Success : Folder has been removed : %s" % dir)
619619
return True
620620

621621

@@ -714,9 +714,11 @@ def package_update(isDeleteOld=False):
714714
print("\nError : Packages deletion failed list: %s" %
715715
error_package['name'])
716716

717+
print("Error : Begin to remove package : %s" %
718+
error_package['name'])
719+
717720
if rm_package(removepath_ver) == False:
718-
print("Please delete the folder manually: %s \n" %
719-
removepath_ver)
721+
print("Error : Please delete the folder manually.\n")
720722
return
721723

722724
# 1.in old ,not in new : Software packages that need to be removed.
@@ -754,14 +756,14 @@ def package_update(isDeleteOld=False):
754756
print('Error message:%s%s. error.message: %s\n\t' %
755757
("Delete folder failed: ", gitdir, e.message))
756758
else:
757-
print("Start to remove %s, please wait...\n" % removepath_ver)
758-
759-
try:
760-
pkgsdb.deletepackdir(removepath_ver, dbsqlite_pathname)
761-
except Exception, e:
762-
pkgs_delete_fail_list.append(pkg)
763-
print('Error message:\n%s %s. %s \n\t' % (
764-
"Delete folder failed, please delete the folder manually", removepath_ver, e.message))
759+
if os.path.isdir(removepath_ver):
760+
print("Start to remove %s, please wait...\n" % removepath_ver)
761+
try:
762+
pkgsdb.deletepackdir(removepath_ver, dbsqlite_pathname)
763+
except Exception, e:
764+
pkgs_delete_fail_list.append(pkg)
765+
print('Error message:\n%s %s. %s \n\t' % (
766+
"Delete folder failed, please delete the folder manually", removepath_ver, e.message))
765767

766768
if len(pkgs_delete_fail_list):
767769
print("Packages deletion failed list: %s \n" %
@@ -852,7 +854,7 @@ def package_update(isDeleteOld=False):
852854
with open(pkgs_fn, 'r') as f:
853855
read_back_pkgs_json = json.load(f)
854856

855-
# print(read_back_pkgs_json)
857+
# print("read_back_pkgs_json : %s" % read_back_pkgs_json)
856858

857859
error_packages_list = []
858860

0 commit comments

Comments
 (0)