Merge pull request #4849 from aws-lumberyard-dev/AddLocalRepoFix
Fix adding local repos
This commit is contained in:
@@ -467,7 +467,7 @@ def register_restricted_path(json_data: dict,
|
||||
|
||||
|
||||
def register_repo(json_data: dict,
|
||||
repo_uri: str or pathlib.Path,
|
||||
repo_uri: str,
|
||||
remove: bool = False) -> int:
|
||||
if not repo_uri:
|
||||
logger.error(f'Repo URI cannot be empty.')
|
||||
@@ -480,9 +480,9 @@ def register_repo(json_data: dict,
|
||||
while repo_uri in json_data['repos']:
|
||||
json_data['repos'].remove(repo_uri)
|
||||
else:
|
||||
repo_uri = pathlib.Path(repo_uri).resolve()
|
||||
while repo_uri.as_posix() in json_data['repos']:
|
||||
json_data['repos'].remove(repo_uri.as_posix())
|
||||
repo_uri = pathlib.Path(repo_uri).resolve().as_posix()
|
||||
while repo_uri in json_data['repos']:
|
||||
json_data['repos'].remove(repo_uri)
|
||||
|
||||
if remove:
|
||||
logger.warn(f'Removing repo uri {repo_uri}.')
|
||||
@@ -566,7 +566,7 @@ def register(engine_path: pathlib.Path = None,
|
||||
external_subdir_path: pathlib.Path = None,
|
||||
template_path: pathlib.Path = None,
|
||||
restricted_path: pathlib.Path = None,
|
||||
repo_uri: str or pathlib.Path = None,
|
||||
repo_uri: str = None,
|
||||
default_engines_folder: pathlib.Path = None,
|
||||
default_projects_folder: pathlib.Path = None,
|
||||
default_gems_folder: pathlib.Path = None,
|
||||
@@ -641,7 +641,7 @@ def register(engine_path: pathlib.Path = None,
|
||||
return 1
|
||||
result = result or register_restricted_path(json_data, restricted_path, remove, project_path, engine_path)
|
||||
|
||||
if isinstance(repo_uri, str) or isinstance(repo_uri, pathlib.PurePath):
|
||||
if isinstance(repo_uri, str):
|
||||
if not repo_uri:
|
||||
logger.error(f'Repo URI cannot be empty.')
|
||||
return 1
|
||||
|
||||
Reference in New Issue
Block a user