[edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: check for manifest-repos section in edkrepo_user.cfg
Bjorge, Erik C
erik.c.bjorge at intel.com
Mon Jun 8 21:55:40 UTC 2020
Reviewed-by: Erik Bjorge <erik.c.bjorge at intel.com>
-----Original Message-----
From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Nate DeSimone
Sent: Monday, June 8, 2020 2:52 PM
To: devel at edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone at intel.com>; Pandya, Puja <puja.pandya at intel.com>; Bret Barkelew <Bret.Barkelew at microsoft.com>; Agyeman, Prince <prince.agyeman at intel.com>; Bjorge, Erik C <erik.c.bjorge at intel.com>
Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: check for manifest-repos section in edkrepo_user.cfg
The manifest-repos command currently does not check for the existance of the 'manifest-repos' section in the edkrepo_user.cfg file. This change adds the check.
Signed-off-by: Nate DeSimone <nathaniel.l.desimone at intel.com>
Cc: Ashley E Desimone <ashley.e.desimone at intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone at intel.com>
Cc: Puja Pandya <puja.pandya at intel.com>
Cc: Bret Barkelew <Bret.Barkelew at microsoft.com>
Cc: Prince Agyeman <prince.agyeman at intel.com>
Cc: Erik Bjorge <erik.c.bjorge at intel.com>
---
edkrepo/commands/manifest_repos_command.py | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/edkrepo/commands/manifest_repos_command.py b/edkrepo/commands/manifest_repos_command.py
index b817662..3dbe604 100644
--- a/edkrepo/commands/manifest_repos_command.py
+++ b/edkrepo/commands/manifest_repos_command.py
@@ -95,13 +95,24 @@ class ManifestRepos(EdkrepoCommand):
user_cfg_file = configparser.ConfigParser(allow_no_value=True)
user_cfg_file.read(user_cfg_file_path)
if args.action == 'add':
+ if not user_cfg_file.has_section('manifest-repos'):
+ user_cfg_file.add_section('manifest-repos')
user_cfg_file.set('manifest-repos', args.name, None)
user_cfg_file.add_section(args.name)
user_cfg_file.set(args.name, 'URL', args.url)
user_cfg_file.set(args.name, 'Branch', args.branch)
user_cfg_file.set(args.name, 'LocalPath', args.path)
if args.action == 'remove':
- user_cfg_file.remove_option('manifest-repos', args.name)
- user_cfg_file.remove_section(args.name)
+ if user_cfg_file.has_section('manifest-repos'):
+ if user_cfg_file.has_option('manifest-repos', args.name):
+ user_cfg_file.remove_option('manifest-repos', args.name)
+ else:
+ raise EdkrepoInvalidParametersException(humble.REMOVE_NOT_EXIST)
+ else:
+ raise EdkrepoInvalidParametersException(humble.REMOVE_NOT_EXIST)
+ if user_cfg_file.has_section(args.name):
+ user_cfg_file.remove_section(args.name)
+ else:
+ raise
+ EdkrepoInvalidParametersException(humble.REMOVE_NOT_EXIST)
with open(user_cfg_file_path, 'w') as cfg_stream:
user_cfg_file.write(cfg_stream)
--
2.26.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#60916): https://edk2.groups.io/g/devel/message/60916
Mute This Topic: https://groups.io/mt/74762422/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list