Update find_project_in_all_indices() to only return None values
for the source manifest repo and config file if the project is
truly not found in any manifest repository. In the case a path
to a manifest file is provided recursively call
find_in_all_indices() with the code name from the manifest at
the provided path to generate the source manifest repo and config
values.
Additionally update the call to find_project_in_all_indices() in
find_source_manifest_repo to use the value of man_repo instead of
None.
Signed-off-by: Ashley E Desimone <ashley.e.desim...@intel.com>
Cc: Nate DeSimone <nathaniel.l.desim...@intel.com>
Cc: Puja Pandya <puja.pan...@intel.com>
Cc: Erik Bjorge <erik.c.bjo...@intel.com>
Cc: Bret Barkelew <bret.barke...@microsoft.com>
Cc: Prince Agyeman <prince.agye...@intel.com>
---
.../manifest_repos_maintenance.py | 26 +++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py
b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py
index 2a5a70f..08c4fe6 100644
--- a/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py
+++ b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py
@@ -185,9 +185,29 @@ def find_project_in_all_indices (project, edkrepo_cfg,
edkrepo_user_cfg, except_
except KeyError:
raise EdkrepoInvalidParametersException(except_msg_man_repo)
elif os.path.isabs(project):
- return None, None, project
+ manifest = ManifestXml(project)
+ try:
+ found_manifest_repo, found_cfg, found_project =
find_project_in_all_indices(manifest.project_info.codename,
+
edkrepo_cfg,
+
edkrepo_user_cfg,
+
except_msg_man_repo,
+
except_msg_not_found,
+
man_repo)
+ return found_manifest_repo, found_cfg, project
+ except EdkrepoManifestNotFoundException:
+ return None, None, project
elif os.path.isfile(os.path.join(os.getcwd(), project)):
- return None, None, os.path.join(os.getcwd(), project)
+ manifest = os.path.join(os.getcwd(), project)
+ try:
+ found_manifest_repo, found_cfg, found_project =
find_project_in_all_indices(manifest.project_info.codename,
+
edkrepo_cfg,
+
edkrepo_user_cfg,
+
except_msg_man_repo,
+
except_msg_not_found,
+
man_repo)
+ return found_manifest_repo, found_cfg, project
+ except EdkrepoManifestNotFoundException:
+ return None, None, os.path.join(os.getcwd(), project)
elif not os.path.dirname(project):
for repo in cfg_man_repos:
if (man_repo and (repo == man_repo)) or not man_repo:
@@ -215,7 +235,7 @@ def find_source_manifest_repo(project_manifest,
edkrepo_cfg, edkrepo_user_cfg, m
edkrepo_user_cfg,
humble.PROJ_NOT_IN_REPO.format(project_manifest.project_info.codename),
humble.SOURCE_MANIFEST_REPO_NOT_FOUND.format(project_manifest.project_info.codename),
-
man_repo=None)
+
man_repo)
project_manifest.write_source_manifest_repo(src_man_repo)
return src_man_repo
--
2.16.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#58902): https://edk2.groups.io/g/devel/message/58902
Mute This Topic: https://groups.io/mt/74081302/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
