From fcb2413c46e98bca66092c0c8f6935fb51f192f3 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Sat, 3 Sep 2022 00:47:49 -0400 Subject: [PATCH] =?UTF-8?q?[wizard]=20=E5=85=81=E8=AE=B8=E4=BD=BF=E7=94=A8?= =?UTF-8?q?-=E5=91=BD=E5=90=8D=E8=BD=AF=E4=BB=B6=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmds/cmd_package/cmd_package_wizard.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmds/cmd_package/cmd_package_wizard.py b/cmds/cmd_package/cmd_package_wizard.py index 3141f9b8..6ba54acc 100644 --- a/cmds/cmd_package/cmd_package_wizard.py +++ b/cmds/cmd_package/cmd_package_wizard.py @@ -47,13 +47,13 @@ def package_wizard(): print('\033[5;33;40m\n1.Please input a new package name :\033[0m') name = user_input() - regular_obj = re.compile('\W') - while name == '' or name.isspace() == True or regular_obj.search(name.strip()): + regular_obj = re.compile('^[\w\d_-]*$') + while name == '' or name.isspace() == True or regular_obj.search(name.strip()) == None: if name == '' or name.isspace(): print('\033[1;31;40mError: you must input a package name. Try again.\033[0m') name = user_input() else: - print('\033[1;31;40mError: package name is made of alphabet, number and underline. Try again.\033[0m') + print('\033[1;31;40mError: package name is made of alphabet, number, underline and dash. Try again.\033[0m') name = user_input() default_description = 'Please add description of ' + name + ' in English.' @@ -155,6 +155,7 @@ def package_wizard(): s = Template(Kconfig_file) upper_name = str.upper(name) + upper_name = upper_name.replace('-', '_') kconfig = s.substitute(name=upper_name, description=description, version=ver, pkgs_class=package_class, lowercase_name=name, version_standard=ver_standard) f = open(os.path.join(pkg_path, 'Kconfig'), 'w')