1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Pass a ManifestXML to find_project_in_all_indices

Ashley E Desimone posted 1 patch 3 years, 11 months ago
Failed in applying to current master (apply log)
edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Pass a ManifestXML to find_project_in_all_indices
Posted by Ashley E Desimone 3 years, 11 months ago 
When attempting to resolve whether a manifest is a loose
manifest or cannot be found pass a ManifestXML object to
the recurisve call toe find_project_in_all_indices

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>
---
 edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py
index 08c4fe6..db41e75 100644
--- a/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py
+++ b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py
@@ -197,7 +197,7 @@ def find_project_in_all_indices (project, edkrepo_cfg, edkrepo_user_cfg, except_
         except EdkrepoManifestNotFoundException:
             return None, None, project
     elif os.path.isfile(os.path.join(os.getcwd(), project)):
-        manifest = os.path.join(os.getcwd(), project)
+        manifest = ManifestXml(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,
-- 
2.16.2.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#59707): https://edk2.groups.io/g/devel/message/59707
Mute This Topic: https://groups.io/mt/74240221/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Pass a ManifestXML to find_project_in_all_indices
Posted by Bjorge, Erik C 3 years, 11 months ago 
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>

-----Original Message-----
From: Desimone, Ashley E <ashley.e.desimone@intel.com> 
Sent: Friday, May 15, 2020 5:19 PM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bjorge, Erik C <erik.c.bjorge@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Agyeman, Prince <prince.agyeman@intel.com>
Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Pass a ManifestXML to find_project_in_all_indices

When attempting to resolve whether a manifest is a loose manifest or cannot be found pass a ManifestXML object to the recurisve call toe find_project_in_all_indices

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>
---
 edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py
index 08c4fe6..db41e75 100644
--- a/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py
+++ b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py
@@ -197,7 +197,7 @@ def find_project_in_all_indices (project, edkrepo_cfg, edkrepo_user_cfg, except_
         except EdkrepoManifestNotFoundException:
             return None, None, project
     elif os.path.isfile(os.path.join(os.getcwd(), project)):
-        manifest = os.path.join(os.getcwd(), project)
+        manifest = ManifestXml(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,
--
2.16.2.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#59709): https://edk2.groups.io/g/devel/message/59709
Mute This Topic: https://groups.io/mt/74240221/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Pass a ManifestXML to find_project_in_all_indices
Posted by Nate DeSimone 3 years, 11 months ago 
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Ashley E
> Desimone
> Sent: Friday, May 15, 2020 5:19 PM
> To: devel@edk2.groups.io
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja
> <puja.pandya@intel.com>; Bjorge, Erik C <erik.c.bjorge@intel.com>; Bret
> Barkelew <Bret.Barkelew@microsoft.com>; Agyeman, Prince
> <prince.agyeman@intel.com>
> Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Pass a
> ManifestXML to find_project_in_all_indices
> 
> When attempting to resolve whether a manifest is a loose manifest or
> cannot be found pass a ManifestXML object to the recurisve call toe
> find_project_in_all_indices
> 
> 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>
> ---
> 
> edkrepo/common/workspace_maintenance/manifest_repos_maintenance.
> py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git
> a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc
> e.py
> b/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc
> e.py
> index 08c4fe6..db41e75 100644
> ---
> a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc
> e.py
> +++
> b/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc
> e.py
> @@ -197,7 +197,7 @@ def find_project_in_all_indices (project,
> edkrepo_cfg, edkrepo_user_cfg, except_
>          except EdkrepoManifestNotFoundException:
>              return None, None, project
>      elif os.path.isfile(os.path.join(os.getcwd(), project)):
> -        manifest = os.path.join(os.getcwd(), project)
> +        manifest = ManifestXml(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,
> --
> 2.16.2.windows.1
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#59729): https://edk2.groups.io/g/devel/message/59729
Mute This Topic: https://groups.io/mt/74240221/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Pass a ManifestXML to find_project_in_all_indices
Posted by Nate DeSimone 3 years, 11 months ago 
Pushed: 66daf5ee

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Ashley E
> Desimone
> Sent: Friday, May 15, 2020 5:19 PM
> To: devel@edk2.groups.io
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja
> <puja.pandya@intel.com>; Bjorge, Erik C <erik.c.bjorge@intel.com>; Bret
> Barkelew <Bret.Barkelew@microsoft.com>; Agyeman, Prince
> <prince.agyeman@intel.com>
> Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Pass a
> ManifestXML to find_project_in_all_indices
> 
> When attempting to resolve whether a manifest is a loose manifest or
> cannot be found pass a ManifestXML object to the recurisve call toe
> find_project_in_all_indices
> 
> 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>
> ---
> 
> edkrepo/common/workspace_maintenance/manifest_repos_maintenance.
> py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git
> a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc
> e.py
> b/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc
> e.py
> index 08c4fe6..db41e75 100644
> ---
> a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc
> e.py
> +++
> b/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc
> e.py
> @@ -197,7 +197,7 @@ def find_project_in_all_indices (project,
> edkrepo_cfg, edkrepo_user_cfg, except_
>          except EdkrepoManifestNotFoundException:
>              return None, None, project
>      elif os.path.isfile(os.path.join(os.getcwd(), project)):
> -        manifest = os.path.join(os.getcwd(), project)
> +        manifest = ManifestXml(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,
> --
> 2.16.2.windows.1
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#59730): https://edk2.groups.io/g/devel/message/59730
Mute This Topic: https://groups.io/mt/74240221/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.