public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Nate DeSimone" <nathaniel.l.desimone@intel.com>
To: devel@edk2.groups.io
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>,
	Puja Pandya <puja.pandya@intel.com>,
	Bret Barkelew <Bret.Barkelew@microsoft.com>,
	Prince Agyeman <prince.agyeman@intel.com>,
	Erik Bjorge <erik.c.bjorge@intel.com>
Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: check for manifest-repos section in edkrepo_user.cfg
Date: Mon,  8 Jun 2020 14:52:14 -0700	[thread overview]
Message-ID: <20200608215214.2296-1-nathaniel.l.desimone@intel.com> (raw)

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


             reply	other threads:[~2020-06-08 21:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-08 21:52 Nate DeSimone [this message]
2020-06-08 21:55 ` [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: check for manifest-repos section in edkrepo_user.cfg Bjorge, Erik C
2020-06-09 21:56 ` Ashley E 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=20200608215214.2296-1-nathaniel.l.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