From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.15785.1589675839305715153 for ; Sat, 16 May 2020 17:37:19 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: erik.c.bjorge@intel.com) IronPort-SDR: uU6w8uY2fu75zw33QkXvtcTsGQLB3lU0GLYoPJ8LEAldE31cVIYNjy3bXTEL2URVW4PrfEUARj fcGKiMSYdtZQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2020 17:37:18 -0700 IronPort-SDR: NL2vsUPWCXS3cSQQizhtkLv4kfrD18sclK13exE4l9PgtaPguA5c8qjk8CKgt9MfsPtn/jcLzz 73rAEnVgF8sw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,401,1583222400"; d="scan'208";a="252728170" Received: from ecbjorge-mobl1.amr.corp.intel.com ([10.209.101.250]) by fmsmga007.fm.intel.com with ESMTP; 16 May 2020 17:37:18 -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] EdkRepo: Fixed submodule attribute in pin files Date: Sat, 16 May 2020 17:37:12 -0700 Message-Id: <3674cec3c9e2a64934546a4ea8db02907ebeb417.1589675752.git.erik.c.bjorge@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When creating pin files the manifest parser added the incorrect attribute to the repo source tag. This resulted in submodules always being disabled in pin files. 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/edkrepo_manifest_parser/edk_manifest.py b/edkrepo_manifest_parser/edk_manifest.py index 02d4620..adf6d52 100644 --- a/edkrepo_manifest_parser/edk_manifest.py +++ b/edkrepo_manifest_parser/edk_manifest.py @@ -534,7 +534,7 @@ class ManifestXml(BaseXmlHelper): 'branch': src_tuple.branch, 'commit': src_tuple.commit, 'sparseCheckout': sparse, - 'enable_submodule': sub, + 'enableSubmodule': sub, 'tag': src_tuple.tag}) else: elem = ET.SubElement(source_root, 'Source', {'localRoot': src_tuple.root, @@ -542,20 +542,20 @@ class ManifestXml(BaseXmlHelper): 'branch': src_tuple.branch, 'commit': src_tuple.commit, 'sparseCheckout': sparse, - 'enable_submodule': sub}) + 'enableSubmodule': sub}) elif src_tuple.branch is None and src_tuple.tag: elem = ET.SubElement(source_root, 'Source', {'localRoot': src_tuple.root, 'remote': src_tuple.remote_name, 'commit': src_tuple.commit, 'sparseCheckout': sparse, - 'enable_submodule': sub, + 'enableSubmodule': sub, 'tag': src_tuple.tag}) elif src_tuple.branch is None and src_tuple.tag is None: elem = ET.SubElement(source_root, 'Source', {'localRoot': src_tuple.root, 'remote': src_tuple.remote_name, 'commit': src_tuple.commit, 'sparseCheckout': sparse, - 'enable_submodule': sub}) + 'enableSubmodule': sub}) else: raise ValueError('Pin.xml cannot be generated with an empty commit value') -- 2.21.0.windows.1