[edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 2/2] EdkRepo: Fixed use of incorrect variable names

[Bjorge, Erik C]

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 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_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


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#59703): https://edk2.groups.io/g/devel/message/59703
Mute This Topic: https://groups.io/mt/74237841/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-