* [edk2-staging/EdkRepo] [PATCH] EdkRepo: Fix argument checks in manifest-repos
@ 2020-06-09 0:17 Nate DeSimone
2020-06-09 0:31 ` Bjorge, Erik C
2020-06-09 21:52 ` Ashley E Desimone
0 siblings, 2 replies; 3+ messages in thread
From: Nate DeSimone @ 2020-06-09 0:17 UTC (permalink / raw)
To: devel
Cc: Ashley E Desimone, Puja Pandya, Bret Barkelew, Prince Agyeman,
Erik Bjorge
Fixed a logic bug in the argument checking for the
manifest-repos command.
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Fix argument checks in manifest-repos
2020-06-09 0:17 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Fix argument checks in manifest-repos Nate DeSimone
@ 2020-06-09 0:31 ` Bjorge, Erik C
2020-06-09 21:52 ` Ashley E Desimone
1 sibling, 0 replies; 3+ messages in thread
From: Bjorge, Erik C @ 2020-06-09 0:31 UTC (permalink / raw)
To: Desimone, Nathaniel L, devel@edk2.groups.io
Cc: Desimone, Ashley E, Pandya, Puja, Bret Barkelew, Agyeman, Prince
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
-----Original Message-----
From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
Sent: Monday, June 8, 2020 5:18 PM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Agyeman, Prince <prince.agyeman@intel.com>; Bjorge, Erik C <erik.c.bjorge@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.desimone@intel.com>
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Fix argument checks in manifest-repos
2020-06-09 0:17 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Fix argument checks in manifest-repos Nate DeSimone
2020-06-09 0:31 ` Bjorge, Erik C
@ 2020-06-09 21:52 ` Ashley E Desimone
1 sibling, 0 replies; 3+ messages in thread
From: Ashley E Desimone @ 2020-06-09 21:52 UTC (permalink / raw)
To: Desimone, Nathaniel L, devel@edk2.groups.io
Cc: Pandya, Puja, Bret Barkelew, Agyeman, Prince, Bjorge, Erik C
Reviewed-by: Ashley DeSimone <ashley.e.desimone@intel.com>
-----Original Message-----
From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
Sent: Monday, June 8, 2020 5:18 PM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Agyeman, Prince <prince.agyeman@intel.com>; Bjorge, Erik C <erik.c.bjorge@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.desimone@intel.com>
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-09 21:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-09 0:17 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Fix argument checks in manifest-repos Nate DeSimone
2020-06-09 0:31 ` Bjorge, Erik C
2020-06-09 21:52 ` Ashley E Desimone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox