* [edk2-staging/EdkRepo] [PATCH] EdkRepo: Improve clone error handling.
@ 2020-05-15 23:44 Ashley E Desimone
2020-05-16 0:39 ` Bjorge, Erik C
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Ashley E Desimone @ 2020-05-15 23:44 UTC (permalink / raw)
To: devel
Cc: Nate DeSimone, Puja Pandya, Erik Bjorge, Bret Barkelew,
Prince Agyeman
Raise an invalid parameters exception when a project is not found.
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/commands/clone_command.py | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/edkrepo/commands/clone_command.py b/edkrepo/commands/clone_command.py
index 179aaf7..3f2e6e1 100644
--- a/edkrepo/commands/clone_command.py
+++ b/edkrepo/commands/clone_command.py
@@ -17,6 +17,7 @@ from edkrepo.common.common_repo_functions import clone_repos, sparse_checkout, v
from edkrepo.common.common_repo_functions import update_editor_config, combinations_in_manifest
from edkrepo.common.common_repo_functions import write_included_config, write_conditional_include
from edkrepo.common.edkrepo_exception import EdkrepoInvalidParametersException, EdkrepoManifestInvalidException
+from edkrepo.common.edkrepo_exception import EdkrepoManifestNotFoundException
from edkrepo.common.humble import CLONE_INVALID_WORKSPACE, CLONE_INVALID_PROJECT_ARG, CLONE_INVALID_COMBO_ARG
from edkrepo.common.humble import SPARSE_CHECKOUT, CLONE_INVALID_LOCAL_ROOTS
from edkrepo.common.workspace_maintenance.workspace_maintenance import case_insensitive_single_match
@@ -81,12 +82,15 @@ class CloneCommand(EdkrepoCommand):
os.makedirs(workspace_dir)
cfg, user_cfg, conflicts = list_available_manifest_repos(config['cfg_file'], config['user_cfg_file'])
- manifest_repo, source_cfg, global_manifest_path = find_project_in_all_indices(args.ProjectNameOrManifestFile,
- config['cfg_file'],
- config['user_cfg_file'],
- PROJ_NOT_IN_REPO.format(args.ProjectNameOrManifestFile),
- SOURCE_MANIFEST_REPO_NOT_FOUND.format(args.ProjectNameOrManifestFile),
- args.source_manifest_repo)
+ try:
+ manifest_repo, source_cfg, global_manifest_path = find_project_in_all_indices(args.ProjectNameOrManifestFile,
+ config['cfg_file'],
+ config['user_cfg_file'],
+ PROJ_NOT_IN_REPO.format(args.ProjectNameOrManifestFile),
+ SOURCE_MANIFEST_REPO_NOT_FOUND.format(args.ProjectNameOrManifestFile),
+ args.source_manifest_repo)
+ except EdkrepoManifestNotFoundException:
+ raise EdkrepoInvalidParametersException(CLONE_INVALID_PROJECT_ARG)
# If this manifest is in a defined manifest repository validate the manifest within the manifest repo
if manifest_repo in cfg:
--
2.16.2.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Improve clone error handling.
2020-05-15 23:44 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Improve clone error handling Ashley E Desimone
@ 2020-05-16 0:39 ` Bjorge, Erik C
2020-05-18 1:53 ` Nate DeSimone
2020-05-18 1:53 ` Nate DeSimone
2 siblings, 0 replies; 4+ messages in thread
From: Bjorge, Erik C @ 2020-05-16 0:39 UTC (permalink / raw)
To: Desimone, Ashley E, devel@edk2.groups.io
Cc: Desimone, Nathaniel L, Pandya, Puja, Bret Barkelew,
Agyeman, Prince
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 4:44 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: Improve clone error handling.
Raise an invalid parameters exception when a project is not found.
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/commands/clone_command.py | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/edkrepo/commands/clone_command.py b/edkrepo/commands/clone_command.py
index 179aaf7..3f2e6e1 100644
--- a/edkrepo/commands/clone_command.py
+++ b/edkrepo/commands/clone_command.py
@@ -17,6 +17,7 @@ from edkrepo.common.common_repo_functions import clone_repos, sparse_checkout, v from edkrepo.common.common_repo_functions import update_editor_config, combinations_in_manifest from edkrepo.common.common_repo_functions import write_included_config, write_conditional_include from edkrepo.common.edkrepo_exception import EdkrepoInvalidParametersException, EdkrepoManifestInvalidException
+from edkrepo.common.edkrepo_exception import
+EdkrepoManifestNotFoundException
from edkrepo.common.humble import CLONE_INVALID_WORKSPACE, CLONE_INVALID_PROJECT_ARG, CLONE_INVALID_COMBO_ARG from edkrepo.common.humble import SPARSE_CHECKOUT, CLONE_INVALID_LOCAL_ROOTS from edkrepo.common.workspace_maintenance.workspace_maintenance import case_insensitive_single_match @@ -81,12 +82,15 @@ class CloneCommand(EdkrepoCommand):
os.makedirs(workspace_dir)
cfg, user_cfg, conflicts = list_available_manifest_repos(config['cfg_file'], config['user_cfg_file'])
- manifest_repo, source_cfg, global_manifest_path = find_project_in_all_indices(args.ProjectNameOrManifestFile,
- config['cfg_file'],
- config['user_cfg_file'],
- PROJ_NOT_IN_REPO.format(args.ProjectNameOrManifestFile),
- SOURCE_MANIFEST_REPO_NOT_FOUND.format(args.ProjectNameOrManifestFile),
- args.source_manifest_repo)
+ try:
+ manifest_repo, source_cfg, global_manifest_path = find_project_in_all_indices(args.ProjectNameOrManifestFile,
+ config['cfg_file'],
+ config['user_cfg_file'],
+ PROJ_NOT_IN_REPO.format(args.ProjectNameOrManifestFile),
+ SOURCE_MANIFEST_REPO_NOT_FOUND.format(args.ProjectNameOrManifestFile),
+ args.source_manifest_repo)
+ except EdkrepoManifestNotFoundException:
+ raise
+ EdkrepoInvalidParametersException(CLONE_INVALID_PROJECT_ARG)
# If this manifest is in a defined manifest repository validate the manifest within the manifest repo
if manifest_repo in cfg:
--
2.16.2.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Improve clone error handling.
2020-05-15 23:44 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Improve clone error handling Ashley E Desimone
2020-05-16 0:39 ` Bjorge, Erik C
@ 2020-05-18 1:53 ` Nate DeSimone
2020-05-18 1:53 ` Nate DeSimone
2 siblings, 0 replies; 4+ messages in thread
From: Nate DeSimone @ 2020-05-18 1:53 UTC (permalink / raw)
To: Desimone, Ashley E, devel@edk2.groups.io
Cc: Pandya, Puja, Bjorge, Erik C, Bret Barkelew, Agyeman, Prince
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> -----Original Message-----
> From: Desimone, Ashley E <ashley.e.desimone@intel.com>
> Sent: Friday, May 15, 2020 4:44 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: Improve clone error
> handling.
>
> Raise an invalid parameters exception when a project is not found.
>
> 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/commands/clone_command.py | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/edkrepo/commands/clone_command.py
> b/edkrepo/commands/clone_command.py
> index 179aaf7..3f2e6e1 100644
> --- a/edkrepo/commands/clone_command.py
> +++ b/edkrepo/commands/clone_command.py
> @@ -17,6 +17,7 @@ from edkrepo.common.common_repo_functions
> import clone_repos, sparse_checkout, v from
> edkrepo.common.common_repo_functions import update_editor_config,
> combinations_in_manifest from
> edkrepo.common.common_repo_functions import write_included_config,
> write_conditional_include from edkrepo.common.edkrepo_exception
> import EdkrepoInvalidParametersException,
> EdkrepoManifestInvalidException
> +from edkrepo.common.edkrepo_exception import
> +EdkrepoManifestNotFoundException
> from edkrepo.common.humble import CLONE_INVALID_WORKSPACE,
> CLONE_INVALID_PROJECT_ARG, CLONE_INVALID_COMBO_ARG from
> edkrepo.common.humble import SPARSE_CHECKOUT,
> CLONE_INVALID_LOCAL_ROOTS from
> edkrepo.common.workspace_maintenance.workspace_maintenance import
> case_insensitive_single_match @@ -81,12 +82,15 @@ class
> CloneCommand(EdkrepoCommand):
> os.makedirs(workspace_dir)
>
> cfg, user_cfg, conflicts = list_available_manifest_repos(config['cfg_file'],
> config['user_cfg_file'])
> - manifest_repo, source_cfg, global_manifest_path =
> find_project_in_all_indices(args.ProjectNameOrManifestFile,
> - config['cfg_file'],
> - config['user_cfg_file'],
> -
> PROJ_NOT_IN_REPO.format(args.ProjectNameOrManifestFile),
> -
> SOURCE_MANIFEST_REPO_NOT_FOUND.format(args.ProjectNameOrManif
> estFile),
> - args.source_manifest_repo)
> + try:
> + manifest_repo, source_cfg, global_manifest_path =
> find_project_in_all_indices(args.ProjectNameOrManifestFile,
> + config['cfg_file'],
> + config['user_cfg_file'],
> +
> PROJ_NOT_IN_REPO.format(args.ProjectNameOrManifestFile),
> +
> SOURCE_MANIFEST_REPO_NOT_FOUND.format(args.ProjectNameOrManif
> estFile),
> + args.source_manifest_repo)
> + except EdkrepoManifestNotFoundException:
> + raise
> + EdkrepoInvalidParametersException(CLONE_INVALID_PROJECT_ARG)
>
> # If this manifest is in a defined manifest repository validate the
> manifest within the manifest repo
> if manifest_repo in cfg:
> --
> 2.16.2.windows.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Improve clone error handling.
2020-05-15 23:44 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Improve clone error handling Ashley E Desimone
2020-05-16 0:39 ` Bjorge, Erik C
2020-05-18 1:53 ` Nate DeSimone
@ 2020-05-18 1:53 ` Nate DeSimone
2 siblings, 0 replies; 4+ messages in thread
From: Nate DeSimone @ 2020-05-18 1:53 UTC (permalink / raw)
To: Desimone, Ashley E, devel@edk2.groups.io
Cc: Pandya, Puja, Bjorge, Erik C, Bret Barkelew, Agyeman, Prince
Pushed: f8ded3c3
> -----Original Message-----
> From: Desimone, Ashley E <ashley.e.desimone@intel.com>
> Sent: Friday, May 15, 2020 4:44 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: Improve clone error
> handling.
>
> Raise an invalid parameters exception when a project is not found.
>
> 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/commands/clone_command.py | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/edkrepo/commands/clone_command.py
> b/edkrepo/commands/clone_command.py
> index 179aaf7..3f2e6e1 100644
> --- a/edkrepo/commands/clone_command.py
> +++ b/edkrepo/commands/clone_command.py
> @@ -17,6 +17,7 @@ from edkrepo.common.common_repo_functions
> import clone_repos, sparse_checkout, v from
> edkrepo.common.common_repo_functions import update_editor_config,
> combinations_in_manifest from
> edkrepo.common.common_repo_functions import write_included_config,
> write_conditional_include from edkrepo.common.edkrepo_exception
> import EdkrepoInvalidParametersException,
> EdkrepoManifestInvalidException
> +from edkrepo.common.edkrepo_exception import
> +EdkrepoManifestNotFoundException
> from edkrepo.common.humble import CLONE_INVALID_WORKSPACE,
> CLONE_INVALID_PROJECT_ARG, CLONE_INVALID_COMBO_ARG from
> edkrepo.common.humble import SPARSE_CHECKOUT,
> CLONE_INVALID_LOCAL_ROOTS from
> edkrepo.common.workspace_maintenance.workspace_maintenance import
> case_insensitive_single_match @@ -81,12 +82,15 @@ class
> CloneCommand(EdkrepoCommand):
> os.makedirs(workspace_dir)
>
> cfg, user_cfg, conflicts = list_available_manifest_repos(config['cfg_file'],
> config['user_cfg_file'])
> - manifest_repo, source_cfg, global_manifest_path =
> find_project_in_all_indices(args.ProjectNameOrManifestFile,
> - config['cfg_file'],
> - config['user_cfg_file'],
> -
> PROJ_NOT_IN_REPO.format(args.ProjectNameOrManifestFile),
> -
> SOURCE_MANIFEST_REPO_NOT_FOUND.format(args.ProjectNameOrManif
> estFile),
> - args.source_manifest_repo)
> + try:
> + manifest_repo, source_cfg, global_manifest_path =
> find_project_in_all_indices(args.ProjectNameOrManifestFile,
> + config['cfg_file'],
> + config['user_cfg_file'],
> +
> PROJ_NOT_IN_REPO.format(args.ProjectNameOrManifestFile),
> +
> SOURCE_MANIFEST_REPO_NOT_FOUND.format(args.ProjectNameOrManif
> estFile),
> + args.source_manifest_repo)
> + except EdkrepoManifestNotFoundException:
> + raise
> + EdkrepoInvalidParametersException(CLONE_INVALID_PROJECT_ARG)
>
> # If this manifest is in a defined manifest repository validate the
> manifest within the manifest repo
> if manifest_repo in cfg:
> --
> 2.16.2.windows.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-18 1:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-15 23:44 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Improve clone error handling Ashley E Desimone
2020-05-16 0:39 ` Bjorge, Erik C
2020-05-18 1:53 ` Nate DeSimone
2020-05-18 1:53 ` Nate DeSimone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox