github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-08 18:14:53 +00:00
Code Issues Projects Releases Wiki Activity

acrn-config: remove git check and avoid to generate patch for config files

Browse Source 
Remove '--enable_commit' argument since acrn-config will not use git tool any
more.

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
2020-03-13 16:33:25 +08:00
committed by wenlingz
parent 0074ad1d20
commit 3c425fa919
11 changed files with 49 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
misc/acrn-config/config_app/views.py
View File

@@ -378,23 +378,20 @@ def generate_src():
launch_setting = generator_config_data['launch_setting']
launch_setting_xml = os.path.join(current_app.config.get('CONFIG_PATH'),
board_type, 'user_defined', launch_setting + '.xml')
commit = False
if 'commit' in generator_config_data and generator_config_data['commit'] == 'yes':
commit = True
msg = {}
error_list = {}
status = 'success'
if src_type == 'generate_config_src':
try:
from board_config.board_cfg_gen import ui_entry_api
error_list = ui_entry_api(board_info_xml, scenario_setting_xml, commit)
error_list = ui_entry_api(board_info_xml, scenario_setting_xml)
except Exception as error:
status = 'fail'
error_list = {'board setting error': str(error)}
try:
from scenario_config.scenario_cfg_gen import ui_entry_api
error_list = ui_entry_api(board_info_xml, scenario_setting_xml, commit)
error_list = ui_entry_api(board_info_xml, scenario_setting_xml)
except Exception as error:
status = 'fail'
error_list = {'scenario setting error': str(error)}
@@ -409,7 +406,7 @@ def generate_src():
try:
from launch_config.launch_cfg_gen import ui_entry_api
error_list = ui_entry_api(board_info_xml, scenario_setting_xml, launch_setting_xml, commit)
error_list = ui_entry_api(board_info_xml, scenario_setting_xml, launch_setting_xml)
except Exception as error:
status = 'fail'
error_list = {'launch setting error': str(error)}