acrn-config: skip git environment check when not do git commit

Check git environment only when '--enable_commit' option was set.

Tracked-On: #3854
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Wei Liu
2019-10-22 19:21:10 +08:00
committed by wenlingz
parent fbd8597fbf
commit 24d3eaba27
7 changed files with 42 additions and 35 deletions

View File

@@ -82,6 +82,11 @@ def main(args):
if err_dic:
return err_dic
# check env
err_dic = scenario_cfg_lib.prepare(enable_commit)
if err_dic:
return err_dic
scenario_cfg_lib.BOARD_INFO_FILE = board_info_file
scenario_cfg_lib.SCENARIO_INFO_FILE = scenario_info_file
@@ -145,11 +150,13 @@ def main(args):
def ui_entry_api(board_info, scenario_info, enable_commit=False):
git_env_check = False
arg_list = ['board_cfg_gen.py', '--board', board_info, '--scenario', scenario_info]
if enable_commit:
arg_list.append('--enable_commit')
git_env_check = True
err_dic = scenario_cfg_lib.prepare()
err_dic = scenario_cfg_lib.prepare(git_env_check)
if err_dic:
return err_dic
@@ -160,12 +167,6 @@ def ui_entry_api(board_info, scenario_info, enable_commit=False):
if __name__ == '__main__':
err_dic = scenario_cfg_lib.prepare()
if err_dic:
for err_k, err_v in err_dic.items():
scenario_cfg_lib.print_red("{}: {}".format(err_k, err_v), err=True)
sys.exit(1)
ARGS = sys.argv
err_dic = main(ARGS)
if err_dic: