public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Bjorge, Erik C" <erik.c.bjorge@intel.com>
To: devel@edk2.groups.io
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>,
	Nate DeSimone <nathaniel.l.desimone@intel.com>,
	Puja Pandya <puja.pandya@intel.com>,
	Bret Barkelew <Bret.Barkelew@microsoft.com>,
	Prince Agyeman <prince.agyeman@intel.com>
Subject: [edk2-staging/EdkRepo] [PATCH v1 2/2] EdkRepo: Fixed use of incorrect variable names
Date: Fri, 15 May 2020 14:43:30 -0700	[thread overview]
Message-ID: <c4d448f205c1c9b3d7bbf32938de9c27bc25793d.1589578727.git.erik.c.bjorge@intel.com> (raw)
In-Reply-To: <cover.1589578727.git.erik.c.bjorge@intel.com>

Fixed two small issues.
- Fixed current combo not being updated in local data.
- Fixed use of name mangled (private) variable.

Signed-off-by: Erik Bjorge <erik.c.bjorge@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_manifest_parser/edk_manifest.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/edkrepo_manifest_parser/edk_manifest.py b/edkrepo_manifest_parser/edk_manifest.py
index 480cd3f..02d4620 100644
--- a/edkrepo_manifest_parser/edk_manifest.py
+++ b/edkrepo_manifest_parser/edk_manifest.py
@@ -434,7 +434,7 @@ class ManifestXml(BaseXmlHelper):
 
         element.attrib['combination'] = combo_name
         self._tree.write(filename)
-        self._general_config.current_combo = combo_name
+        self._general_config.curr_combo = combo_name
 
     def write_source_manifest_repo(self, manifest_repo, filename=None):
         '''
@@ -453,7 +453,7 @@ class ManifestXml(BaseXmlHelper):
             element.tail = '\n'
         element.attrib['manifest_repo'] = manifest_repo
         self._tree.write(filename)
-        self.__general_config.source_manifest_repo = manifest_repo
+        self._general_config.source_manifest_repo = manifest_repo
 
     def generate_pin_xml(self, description, combo_name, repo_source_list, filename=None):
 
@@ -1070,6 +1070,7 @@ def main():
 
             print('\nAttempting to write TESTCOMBO to current combo field of TestManifest.xml')
             test_manifest.write_current_combo('TESTCOMBO', 'TestManifest.xml')
+            print('Updated current combo: {}'.format(test_manifest.general_config.current_combo))
 
         print(separator_string)
         if test_manifest.is_pin_file():
-- 
2.21.0.windows.1


  parent reply	other threads:[~2020-05-15 21:43 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-15 21:43 [edk2-staging/EdkRepo] [PATCH v1 0/2] Manifest parser line ending cleanup and small bug fixes Bjorge, Erik C
2020-05-15 21:43 ` [edk2-staging/EdkRepo] [PATCH v1 1/2] EdkRepo: Normalize line endings Bjorge, Erik C
2020-05-15 21:43 ` Bjorge, Erik C [this message]
2020-05-18  1:44 ` [edk2-staging/EdkRepo] [PATCH v1 0/2] Manifest parser line ending cleanup and small bug fixes Nate DeSimone
2020-05-18  1:48 ` Nate 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=c4d448f205c1c9b3d7bbf32938de9c27bc25793d.1589578727.git.erik.c.bjorge@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