Skip to content

Commit 841be31

Browse files
authored
Merge pull request #8 from SummerGGift/optimize
【修改】:完善功能
2 parents feb624c + 778a2f4 commit 841be31

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

cmds/cmd_package.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,7 @@ def pre_package_update():
509509
""" Make preparations before updating the software package. """
510510

511511
bsp_root = Import('bsp_root')
512+
env_root = Import('env_root')
512513
from cmd_package import determine_support_chinese
513514

514515
if not os.path.exists('.config'):
@@ -545,7 +546,6 @@ def pre_package_update():
545546
sql = '''CREATE TABLE packagefile
546547
(pathname TEXT ,package TEXT ,md5 TEXT );'''
547548
pkgsdb.create_table(conn, sql)
548-
# print("Create dbsqlite done")
549549

550550
fn = '.config'
551551
pkgs = kconfig.parse(fn)
@@ -717,15 +717,13 @@ def package_update(isDeleteOld=False):
717717
remind the user saved the modified file.
718718
"""
719719

720+
if not pre_package_update()
721+
return
722+
720723
bsp_root = Import('bsp_root')
721724
env_root = Import('env_root')
722725
flag = True
723726

724-
sys_value = pre_package_update()
725-
726-
if not sys_value:
727-
return
728-
729727
# According to the env version, whether Chinese output is supported or not
730728
if determine_support_chinese(env_root):
731729
if platform.system() == "Windows":

0 commit comments

Comments
 (0)