Merge pull request #1029 from aws-lumberyard-dev/FixIosApp

Fix ios app
This commit is contained in:
moudgils
2021-05-28 10:43:19 -07:00
committed by GitHub
4 changed files with 7 additions and 5 deletions
+3 -3
View File
@@ -149,7 +149,7 @@ def get_bootstrap_values(bootstrap_dir, keys_to_extract):
raise logging.error(f'Bootstrap.setreg file {bootstrap_file} does not exist.')
result_map = {}
with bootstrap_file.open('r') as f:
with open(bootstrap_file, 'r') as f:
try:
json_data = json.load(f)
except Exception as e:
@@ -157,9 +157,9 @@ def get_bootstrap_values(bootstrap_dir, keys_to_extract):
else:
for search_key in keys_to_extract:
try:
search_result = json_data["Amazon"]["AzCore"]["Bootstrap"][f'"{search_key}"']
search_result = json_data["Amazon"]["AzCore"]["Bootstrap"][search_key]
except KeyError as e:
logging.error(f'Bootstrap.setreg cannot find Amazon:AzCore:Bootstrap:{search_result}: {str(e)}')
logging.warning(f'Bootstrap.setreg cannot find /Amazon/AzCore/Bootstrap/{search_key}: {str(e)}')
else:
result_map[search_key] = search_result
+1 -1
View File
@@ -107,7 +107,7 @@ def verify_layout(layout_dir, platform_name, project_path, asset_mode, asset_typ
project_name_lower = project_path.lower()
layout_path = pathlib.Path(layout_dir)
bootstrap_path = layout_path / 'Registry'
bootstrap_path = pathlib.Path(ROOT_ENGINE_PATH) / 'Registry'
bootstrap_values = common.get_bootstrap_values(str(bootstrap_path), [f'{platform_name_lower}_remote_filesystem',
f'{platform_name_lower}_connect_to_remote',
f'{platform_name_lower}_wait_for_connect',