From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com []) by mx.groups.io with SMTP id smtpd.web11.1467.1589579035519069832 for ; Fri, 15 May 2020 14:43:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: erik.c.bjorge@intel.com) IronPort-SDR: nGy2oOvdrz/aHJMvprDPtXVrNFGpmZkQ8W//B40OEotPhMrj8mY+3IcxIRipv+35Y1mDqLTFyP Phm7+tmzGVsQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2020 14:43:57 -0700 IronPort-SDR: OZdo0pp6/9CngCg+NNcE752n7vf0/SxFwYsLmzcATy3n0xs6e/DIwVqnJl7TAPovhcB5ULhotp vvp7VoI14DUA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,396,1583222400"; d="scan'208";a="410599853" Received: from ecbjorge-mobl1.amr.corp.intel.com ([10.212.5.228]) by orsmga004.jf.intel.com with ESMTP; 15 May 2020 14:43:57 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Ashley E Desimone , Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-staging/EdkRepo] [PATCH v1 2/2] EdkRepo: Fixed use of incorrect variable names Date: Fri, 15 May 2020 14:43:30 -0700 Message-Id: X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Cc: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge --- 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