1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: check for manifest-repos section in edkrepo_user.cfg

Nate DeSimone posted 1 patch 3 years, 10 months ago
Failed in applying to current master (apply log)
edkrepo/commands/manifest_repos_command.py | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
[edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: check for manifest-repos section in edkrepo_user.cfg
Posted by Nate DeSimone 3 years, 10 months ago 
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@intel.com>
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.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/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 (#60915): https://edk2.groups.io/g/devel/message/60915
Mute This Topic: https://groups.io/mt/74762422/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: check for manifest-repos section in edkrepo_user.cfg
Posted by Bjorge, Erik C 3 years, 10 months ago 
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Nate DeSimone
Sent: Monday, June 8, 2020 2:52 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-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@intel.com>
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.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/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/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: check for manifest-repos section in edkrepo_user.cfg
Posted by Ashley E Desimone 3 years, 10 months ago 
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 2:52 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: 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@intel.com>
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.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/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 (#60994): https://edk2.groups.io/g/devel/message/60994
Mute This Topic: https://groups.io/mt/74762422/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.