From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.34947.1589767785113948045 for ; Sun, 17 May 2020 19:09:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=mCkSAtlH; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: dsuIXmn+91/9Q4eJA6aY+C2DWngqG+VwkBWMHkWUNGg+2WmcCk4GiDnyc2wG7Ix/cFvmY2yDZK 582GfWyDZfMg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2020 19:09:44 -0700 IronPort-SDR: tFCoed5KYyUe4+dTfB4EW/Qpv9Z3wNdyLc/01moUaZwnKH9c8ap9dqfdkGNITo0sgTzSrl0q7n ayFynlEPbM2A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,405,1583222400"; d="scan'208";a="307969321" Received: from orsmsx104.amr.corp.intel.com ([10.22.225.131]) by FMSMGA003.fm.intel.com with ESMTP; 17 May 2020 19:09:43 -0700 Received: from orsmsx158.amr.corp.intel.com (10.22.240.20) by ORSMSX104.amr.corp.intel.com (10.22.225.131) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 17 May 2020 19:09:43 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by ORSMSX158.amr.corp.intel.com (10.22.240.20) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 17 May 2020 19:09:42 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.171) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 17 May 2020 19:09:43 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=el0cNB+J3AqNr74X2A6eq2L6QMwmef7JDi7uxr8k+Kd1n+PMCRCICRym4KbBiVnH185GmRQJ+fNTnsJ6KYtXzbHD5Dnf8OPVJJYMRRbXaz7YuL/GjzIeiR4RYvYSPEkef3exgYuGxFJQQpHfG0SWaWrHH+GiUJIyp9+g3V5wGZ0vU5eTfDUOvfsUXI/WkBr8EPUmiPdDSpsNEzu9zjHgGyYJtQbe/QoassMqmpD6BK5prApqP7BX/DWUtdF0ZbVnMwn3AwbFKUBv52sL4RRw/tJb6hE/WW4Z4uEj3u5cUj1x2MGeqRoQDSHDxJP5CppkyqMdcZL9H36dFvUgzUN+VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PiWVm80PIxwA/PhxHlB9gtra9e+DGwDdp5rdst9x6N4=; b=ZK1Pofk1U7DyTilayqb25yuBcLLU8VfQSgiyXSlKweOUUXljmF1QkEknjBf1VDqfgLQG4Pzk6NTYFLh2dHKjJ9X0dOqxKDgs6hJCkZXstTkqviMpmj3/f36FtuIuz0lSVKri56tMKr9bycXgVWdDnJ17ycjzU02RsC91Yi5qTOwAUdfVN1yZq+0xUoJZ1oeUXdokobnE1CtrE77qCmCqK+0R/zK5AAYPBtiScW4wupqUkDgc7FIyZKEBOsZ7RL0GQ6/pw319jUJQQT9ZuFmjOMowZcieXq66d9UksCRV3Oie8rDx5qAq/XiRlkX/QyJVYVIKjZrP0C8hJzP5hzZSlA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PiWVm80PIxwA/PhxHlB9gtra9e+DGwDdp5rdst9x6N4=; b=mCkSAtlHsMO6tI2YaupGreRDfAHb29XiacZ/7+/g5FjJ+qGWp30QHqqrc6odnL260vZNZvX8aAueUZkGDrGY7K03SofaFLUmp6qGlobr+Bz7K0FXO94ZrFxCHegJmT2NunyA4HoW115EnRvAfP/VYnJUfU2qTbIvbYHOr484E04= Received: from BYAPR11MB3496.namprd11.prod.outlook.com (2603:10b6:a03:8b::16) by BYAPR11MB2790.namprd11.prod.outlook.com (2603:10b6:a02:c4::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.27; Mon, 18 May 2020 02:09:40 +0000 Received: from BYAPR11MB3496.namprd11.prod.outlook.com ([fe80::114a:dfed:5bd3:bc00]) by BYAPR11MB3496.namprd11.prod.outlook.com ([fe80::114a:dfed:5bd3:bc00%7]) with mapi id 15.20.3000.034; Mon, 18 May 2020 02:09:40 +0000 From: "Nate DeSimone" To: "devel@edk2.groups.io" , "Bjorge, Erik C" CC: "Desimone, Ashley E" , "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fixed submodule attribute in pin files Thread-Topic: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fixed submodule attribute in pin files Thread-Index: AQHWK+NrD/d6EYCmmU2SEUw/ZpgoP6itGrsQ Date: Mon, 18 May 2020 02:09:40 +0000 Message-ID: References: <3674cec3c9e2a64934546a4ea8db02907ebeb417.1589675752.git.erik.c.bjorge@intel.com> In-Reply-To: <3674cec3c9e2a64934546a4ea8db02907ebeb417.1589675752.git.erik.c.bjorge@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNzBjZDg1YjMtMzA5Yy00ODgzLTk4YzUtYTUxMGRhMTUzMDg4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiRkh0ZXpyWW01QThmYkMyd1BUbTNNVDI5dmN5WVwvR0c0YXBRRzNaNkpDUHNiNlBwODNhZytKdmROc2lWZXB5dVEifQ== dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows x-ctpclassification: CTP_NT authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [134.134.136.208] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1ae7233d-b287-4015-94ea-08d7fad0864d x-ms-traffictypediagnostic: BYAPR11MB2790: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:326; x-forefront-prvs: 04073E895A x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Qph6s/Hto5KyZi+jEMws61C6IHnjD3Qm/QTNtCIMBKln8TtXMz5DZW+kGJB/hcqCtSnO+pjye1l9up3MJWNr1iXP4ZJSsrlGneCGOn7qO/41bmzj5ZHUw6WTMic/1tVA8nH7mcBD+FtN5y5qbYjTP2jx73M81j5IJs7yrfwwTvcR8wilSOAqZqr+BrCRbcNRqAW1V0+mzZWdAECr8Xdnh0wtEP4/0linUJpCi5uE558hSEp9R3wCNW0/2R2ZthBcLQ2e/7C+bkO+KlAdWV//E+e08r5/EFxk+3cI24yPLe+oI9z9MNNuhj2Vj231zx7HUQ95iRfry3vMyF3YaxrQLcr7TIbiDk1TI+NS9X+hyh6LxudHerzqwD+At8eAAbAuQ2XRSQQguOCdZa1VtzbMUdyyIbc24khNSFpzrL2ha4yh9/rTVI6r0vj2LtKCBWZxqWDFohaB1YHGUAculcEmNuhge0NUa5yDbixS+JuasEFwoNAIGUzhiQ13zw2uKhcS3nz3gE79sEeJYfHIE/2BpQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR11MB3496.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(366004)(136003)(346002)(39860400002)(376002)(396003)(33656002)(966005)(4326008)(6636002)(2906002)(55016002)(316002)(8676002)(86362001)(66476007)(9686003)(8936002)(7696005)(5660300002)(52536014)(76116006)(107886003)(54906003)(26005)(66446008)(64756008)(186003)(71200400001)(66556008)(66946007)(110136005)(53546011)(6506007)(478600001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: LNmX9HhvqJWmFXyFUBDn9V2V8eeOl+KCyTT7g+jK11qnenEtMFnNvq78x8/ksodyBysh12x+zUZcLxjxXInKjM1cd0x1JPZI27SUbR3nrLwfedGR/AUgCUCFeI7MBn2qDnJyr64GMVkelL3Qa0E2wLMnWfExT0u8RErHLwln0zve4wgc2xdkLI3Rt7YSsI9luRdwZ/dXsIbDbCOgPqWvPNOMKWKNp/YP+MEeVhw4hHndPtqSfudhFfCueGZyKiJ2OAPYr+geydYePC2PL/kGjrkBXBtuoleOGW7QQnIoljFfC0Al0UJMnG/r/HZcTpIYqPFTZLCgDyU0foJtBD/YE8FSTDf76EdYAxKFRBRdu6tJqag/yCsYogL0G0bbvcVlVhARILC0juFoOiQ0ydoktHYcSWFQOtyOrWts2uQXVg4RnaqXB9zFO9QORebEPKF78vGn0kWIpS/UqvFocs9uvuQLUoYdPSwO0Jo6nXsai/g9HWyKqaeCV4w+X6ASf3r9 MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 1ae7233d-b287-4015-94ea-08d7fad0864d X-MS-Exchange-CrossTenant-originalarrivaltime: 18 May 2020 02:09:40.8438 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: M4O2weHAiSHmqMxoi1YwahbvDYe6ISnqTGs+Mxb1nwiz7p/k4O0lrylHDxQUoq1iZg6udUQY2ULcw6LD7dTxuQxLsjWq8ksSn7brhUdylhQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2790 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Bjorge, > Erik C > Sent: Saturday, May 16, 2020 5:37 PM > To: devel@edk2.groups.io > Cc: Desimone, Ashley E ; Desimone, > Nathaniel L ; Pandya, Puja > ; Bret Barkelew ; > Agyeman, Prince > Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fixed > submodule attribute in pin files >=20 > When creating pin files the manifest parser added the incorrect attribut= e to > the repo source tag. This resulted in submodules always being disabled = in pin > files. >=20 > 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(-) >=20 > 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): > 'b= ranch': src_tuple.branch, > 'c= ommit': src_tuple.commit, > 's= parseCheckout': sparse, > - 'e= nable_submodule': sub, > + > + 'enableSubmodule': sub, > 't= ag': src_tuple.tag}) > else: > elem =3D ET.SubElement(source_root, 'Source', {= 'localRoot': > src_tuple.root, @@ -542,20 +542,20 @@ class ManifestXml(BaseXmlHelper): > 'b= ranch': src_tuple.branch, > 'c= ommit': src_tuple.commit, > 's= parseCheckout': sparse, > - 'e= nable_submodule': sub}) > + > + 'enableSubmodule': sub}) > elif src_tuple.branch is None and src_tuple.tag: > elem =3D ET.SubElement(source_root, 'Source', {'loc= alRoot': > src_tuple.root, > 'remot= e': src_tuple.remote_name, > 'commi= t': src_tuple.commit, > 'spars= eCheckout': sparse, > - 'enabl= e_submodule': sub, > + > + 'enableSubmodule': sub, > 'tag':= src_tuple.tag}) > elif src_tuple.branch is None and src_tuple.tag is None= : > elem =3D ET.SubElement(source_root, 'Source', {'loc= alRoot': > src_tuple.root, > 'remot= e': src_tuple.remote_name, > 'commi= t': src_tuple.commit, > 'spars= eCheckout': sparse, > - 'enabl= e_submodule': sub}) > + > + 'enableSubmodule': sub}) > else: > raise ValueError('Pin.xml cannot be generated with an e= mpty > commit value') >=20 > -- > 2.21.0.windows.1 >=20 >=20 >=20