From nobody Fri Mar 29 13:56:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59716+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59716+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1589675840; cv=none; d=zohomail.com; s=zohoarc; b=ZOmd4xkiOKXo+BNU62vMNl6o2nHQGCs4YcpOuf6///vuvFnsgv+OtKRQFeIo5s5uatz3WsXLd3FMvE2VK36NhtJszZmPgdRXhwxBlVOOL8V9j5RqpnSeTxXnhNQQhMlT9wLjkLf73NoFiWKCa4y7GxXg8POth4xIhLk1gSXU5bM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589675840; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=IX+fETAR6J2DnZeZocytx1/3FXe4JPCEOwXoWoDLRys=; b=Rbu0BL05a32K+UQiSXjgBR+uuITmaEE11jwbsXT1lD8/IUgMJZ/zK/ma1/ih8Ki9WexdydB/+3UW/Vd+Mr5kOdkaSGHPvld/7XjfOLX5DT6mRaRte8esQKoS1SONzbSLC9RpYb8kqhsbPVdZRRFgzqykqOPjicN8fwEmKmfje6g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59716+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589675840563856.3938189043519; Sat, 16 May 2020 17:37:20 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id fwS6YY1788612xX68UT2nbtz; Sat, 16 May 2020 17:37:20 -0700 X-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 IronPort-SDR: uU6w8uY2fu75zw33QkXvtcTsGQLB3lU0GLYoPJ8LEAldE31cVIYNjy3bXTEL2URVW4PrfEUARj fcGKiMSYdtZQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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" X-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-devel] [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> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,erik.c.bjorge@intel.com X-Gm-Message-State: nV3xIE28Z3pfMEix9rs1YqGzx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589675840; bh=A7BDFZKldwADYt5q2MhRIWmLttNh9I/BdrjKqUAueiM=; h=Cc:Date:From:Reply-To:Subject:To; b=BBvtXv/5y1lEmcMf+bw6NrpHt7YAXP3jtt8G+6cLjpbk/oTK30C8s2SpV03tViRg0kQ FVSz4Sb8n1phbjlgEeaAKtgtPjU4o5PEGqI05SHAv2gP8rL8IV4o/uy9s6C5H3h0NiwQk 2TFSpX2ufn2jCQZbBoGJZJy6SgQJC87XDCQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Nate DeSimone --- 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_par= ser/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): 'bran= ch': src_tuple.branch, 'comm= it': src_tuple.commit, 'spar= seCheckout': sparse, - 'enab= le_submodule': sub, + 'enab= leSubmodule': sub, 'tag'= : src_tuple.tag}) else: elem =3D ET.SubElement(source_root, 'Source', {'lo= calRoot': src_tuple.root, @@ -542,20 +542,20 @@ class ManifestXml(BaseXmlHelper): 'bran= ch': src_tuple.branch, 'comm= it': src_tuple.commit, 'spar= seCheckout': sparse, - 'enab= le_submodule': sub}) + 'enab= leSubmodule': sub}) elif src_tuple.branch is None and src_tuple.tag: elem =3D ET.SubElement(source_root, 'Source', {'localR= oot': src_tuple.root, 'remote':= src_tuple.remote_name, 'commit':= src_tuple.commit, 'sparseCh= eckout': sparse, - 'enable_s= ubmodule': sub, + 'enableSu= bmodule': sub, 'tag': sr= c_tuple.tag}) elif src_tuple.branch is None and src_tuple.tag is None: elem =3D ET.SubElement(source_root, 'Source', {'localR= oot': src_tuple.root, 'remote':= src_tuple.remote_name, 'commit':= src_tuple.commit, 'sparseCh= eckout': sparse, - 'enable_s= ubmodule': sub}) + 'enableSu= bmodule': sub}) else: raise ValueError('Pin.xml cannot be generated with an empt= y commit value') =20 --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#59716): https://edk2.groups.io/g/devel/message/59716 Mute This Topic: https://groups.io/mt/74261598/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-