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: Improve clone error handling.
Date: Fri, 15 May 2020 16:44:12 -0700 [thread overview]
Message-ID: <20200515234412.18064-1-ashley.e.desimone@intel.com> (raw)
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
next reply other threads:[~2020-05-15 23:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 23:44 Ashley E Desimone [this message]
2020-05-16 0:39 ` [edk2-staging/EdkRepo] [PATCH] EdkRepo: Improve clone error handling Bjorge, Erik C
2020-05-18 1:53 ` Nate DeSimone
2020-05-18 1:53 ` 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=20200515234412.18064-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