public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Ashley E Desimone" <ashley.e.desimone@intel.com>
To: devel@edk2.groups.io
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>,
	Puja Pandya <puja.pandya@intel.com>,
	Erik Bjorge <erik.c.bjorge@intel.com>,
	Bret Barkelew <Bret.Barkelew@microsoft.com>,
	Prince Agyeman <prince.agyeman@intel.com>
Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Address corner cases in find_project_in_all_indices
Date: Fri,  8 May 2020 12:45:09 -0700	[thread overview]
Message-ID: <20200508194509.10620-1-ashley.e.desimone@intel.com> (raw)

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.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@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


             reply	other threads:[~2020-05-08 19:45 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-08 19:45 Ashley E Desimone [this message]
2020-05-10  3:18 ` [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Address corner cases in find_project_in_all_indices Nate DeSimone
2020-05-10  3:25 ` Nate DeSimone

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200508194509.10620-1-ashley.e.desimone@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox