提交 715b162a 编写于 作者: C chenyanpanHW 提交者: Gitee

!1 命令行工具参数异常报错问题

Merge pull request !1 from ZhangYifan/I1Q15Z-cli_error_log
...@@ -119,6 +119,9 @@ def params_input_track(params, file_path=None): ...@@ -119,6 +119,9 @@ def params_input_track(params, file_path=None):
""" """
load tracking from command line arguments load tracking from command line arguments
""" """
if not check_add_param(params):
return 'error', 'Check input params error'
if add_param_check_url(params, file_path) == 'error': if add_param_check_url(params, file_path) == 'error':
return 'error', 'Check input params error.' return 'error', 'Check input params error.'
...@@ -156,6 +159,19 @@ def params_input_track(params, file_path=None): ...@@ -156,6 +159,19 @@ def params_input_track(params, file_path=None):
return 'error', 'Unexpected Error.' return 'error', 'Unexpected Error.'
def check_add_param(params):
success = True
required_params = ["repo", "branch", "scm_repo", "scm_branch", "version_control", "enabled"]
miss_params = list()
for param in required_params:
if param not in params or not params[param]:
miss_params.append(param)
success = False
if not success:
print("patch_tracking_cli add: error: the following arguments are required: --{}".format(", --".join(miss_params)))
return success
def add(args): def add(args):
""" """
add tracking add tracking
...@@ -304,7 +320,7 @@ add_usage = """ ...@@ -304,7 +320,7 @@ add_usage = """
%(prog)s --server SERVER --user USER --password PASSWORD --file FILE %(prog)s --server SERVER --user USER --password PASSWORD --file FILE
%(prog)s --server SERVER --user USER --password PASSWORD --dir DIR""" %(prog)s --server SERVER --user USER --password PASSWORD --dir DIR"""
parser_add = subparsers.add_parser( parser_add = subparsers.add_parser(
'add', parents=[common_parser, authentication_parser], help="add tracking", usage=add_usage 'add', parents=[common_parser, authentication_parser], help="add tracking", usage=add_usage, allow_abbrev=False
) )
parser_add.set_defaults(func=add) parser_add.set_defaults(func=add)
parser_add.add_argument("--version_control", choices=['github'], help="upstream version control system") parser_add.add_argument("--version_control", choices=['github'], help="upstream version control system")
...@@ -319,7 +335,7 @@ parser_add.add_argument('--dir', help='import patch tracking from files in direc ...@@ -319,7 +335,7 @@ parser_add.add_argument('--dir', help='import patch tracking from files in direc
# delete # delete
del_usage = """ del_usage = """
%(prog)s --server SERVER --table TABLE --repo REPO [--branch BRANCH]""" %(prog)s --server SERVER --table TABLE --repo REPO [--branch BRANCH]"""
parser_delete = subparsers.add_parser('delete', parents=[common_parser, authentication_parser], help="delete tracking") parser_delete = subparsers.add_parser('delete', parents=[common_parser, authentication_parser], help="delete tracking", allow_abbrev=False)
parser_delete.set_defaults(func=delete) parser_delete.set_defaults(func=delete)
parser_delete.add_argument("--repo", required=True, help="source package repository") parser_delete.add_argument("--repo", required=True, help="source package repository")
parser_delete.add_argument("--branch", help="source package branch") parser_delete.add_argument("--branch", help="source package branch")
...@@ -327,7 +343,7 @@ parser_delete.add_argument("--branch", help="source package branch") ...@@ -327,7 +343,7 @@ parser_delete.add_argument("--branch", help="source package branch")
# query # query
query_usage = """ query_usage = """
%(prog)s --server SERVER --table {tracking,issue} [--repo REPO] [--branch BRANCH]""" %(prog)s --server SERVER --table {tracking,issue} [--repo REPO] [--branch BRANCH]"""
parser_query = subparsers.add_parser('query', parents=[common_parser], help="query tracking/issue") parser_query = subparsers.add_parser('query', parents=[common_parser], help="query tracking/issue", allow_abbrev=False)
parser_query.set_defaults(func=query) parser_query.set_defaults(func=query)
parser_query.add_argument("--table", required=True, choices=["tracking", "issue"], help="query tracking or issue") parser_query.add_argument("--table", required=True, choices=["tracking", "issue"], help="query tracking or issue")
parser_query.add_argument("--repo", help="source package repository") parser_query.add_argument("--repo", help="source package repository")
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册