Reviewed-by: Erik Bjorge <erik.c.bjo...@intel.com>
-----Original Message-----
From: Desimone, Nathaniel L <nathaniel.l.desim...@intel.com>
Sent: Monday, June 8, 2020 5:18 PM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desim...@intel.com>; Pandya, Puja
<puja.pan...@intel.com>; Bret Barkelew <bret.barke...@microsoft.com>; Agyeman,
Prince <prince.agye...@intel.com>; Bjorge, Erik C <erik.c.bjo...@intel.com>
Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Fix argument checks in
manifest-repos
Fixed a logic bug in the argument checking for the manifest-repos command.
Signed-off-by: Nate DeSimone <nathaniel.l.desim...@intel.com>
Cc: Ashley E Desimone <ashley.e.desim...@intel.com>
Cc: Puja Pandya <puja.pan...@intel.com>
Cc: Bret Barkelew <bret.barke...@microsoft.com>
Cc: Prince Agyeman <prince.agye...@intel.com>
Cc: Erik Bjorge <erik.c.bjo...@intel.com>
---
edkrepo/commands/humble/manifest_repos_humble.py | 2 +-
edkrepo/commands/manifest_repos_command.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/edkrepo/commands/humble/manifest_repos_humble.py
b/edkrepo/commands/humble/manifest_repos_humble.py
index 7dc8bfe..4a886a4 100644
--- a/edkrepo/commands/humble/manifest_repos_humble.py
+++ b/edkrepo/commands/humble/manifest_repos_humble.py
@@ -14,7 +14,7 @@ Contains user visible strings printed by the manifest_repos
command.
CFG_LIST_ENTRY = 'Config File: edkrepo.cfg Manifest Repository Name: {}'
USER_CFG_LIST_ENTRY = 'Config File: edkrepo_user.cfg Manifest Repository Name:
{}'
NAME_REQUIRED = 'The "name" argument is required to add/remove a manifest
repository'
-ADD_REQUIRED = 'The "name", "url", "branch" and "local-path" arguments are
required to add a manifest repository'
+ADD_REQUIRED = 'The "name", "url", "branch" and "path" arguments are required
to add a manifest repository'
CANNOT_REMOVE_CFG = 'Manifest repositories cannot be removed from the
edkrepo.cfg file.'
REMOVE_NOT_EXIST = 'The selected manifest repository does note exist in the
edkrepo_user.cfg file.'
ALREADY_EXISTS = 'A manifest repository already exists with name: {}'
diff --git a/edkrepo/commands/manifest_repos_command.py
b/edkrepo/commands/manifest_repos_command.py
index b817662..af79f19 100644
--- a/edkrepo/commands/manifest_repos_command.py
+++ b/edkrepo/commands/manifest_repos_command.py
@@ -80,7 +80,7 @@ class ManifestRepos(EdkrepoCommand):
elif (args.action == ('add' or 'remove')) and not args.name:
raise EdkrepoInvalidParametersException(humble.NAME_REQUIRED)
- elif args.action == 'add' and not (args.branch or args.url or
args.local_path):
+ elif args.action == 'add' and (not args.branch or not args.url or not
args.path):
raise EdkrepoInvalidParametersException(humble.ADD_REQUIRED)
elif args.action == 'remove' and args.name and args.name in cfg_repos:
raise EdkrepoInvalidParametersException(humble.CANNOT_REMOVE_CFG)
--
2.26.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#60920): https://edk2.groups.io/g/devel/message/60920
Mute This Topic: https://groups.io/mt/74764970/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
