From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.791.1592590719767406805 for ; Fri, 19 Jun 2020 11:18:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=VfrGU2lt; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: mupazmM4NnMFUw/kjVVEXl9zCQ8t5Fsuc9hJfg2QDo49XpQ1C+QLXc2tfVs5lPTVkO06hyYx4c B173XgneltkQ== X-IronPort-AV: E=McAfee;i="6000,8403,9657"; a="161145117" X-IronPort-AV: E=Sophos;i="5.75,256,1589266800"; d="scan'208";a="161145117" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2020 11:18:39 -0700 IronPort-SDR: gc59wjGnULR5m+AkpJ3xkss2dHnlDIRHO7z2t3yegScRl5nZUR2xDj9dSYTnpO5RjSq1RYZJY5 6ikcXZw7dGSA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,256,1589266800"; d="scan'208";a="421945600" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga004.jf.intel.com with ESMTP; 19 Jun 2020 11:18:38 -0700 Received: from fmsmsx604.amr.corp.intel.com (10.18.126.84) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 19 Jun 2020 11:18:38 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 19 Jun 2020 11:18:37 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Fri, 19 Jun 2020 11:18:37 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.100) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 19 Jun 2020 11:18:37 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gnJE50U65XKjrUPzE0AmnCN6dBwJzQUD3qWEffD9Xv1NYGsnjavFm+VOGtgsm6BgU9D/DP0QO2cKbarRhy+I3YB1uw3keOuzxCKTjj4StkVr7oFFwNOSHa7oDW283RfJPZ3Fn7Dr14520Dqjiq27V+hcLrBN4KPQ32PjQdlpn9Zw/0hPyFxwhFvtIQKorHGLS6ifudpxPAApWI1LzEae3rW0I0jes3RV6TGRpv+TCRcX6Tt4owinpJFTjQUaE6hAttIYHQZRKpNzOAxB9JRc+n4QTR66KhhBnj9Th8TGV77gIf0nPE/Y98Qxbhlb2iabH+hzimPHdfGohfeeR8bLzA== 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=1Lq2oSP3SQ4bg5Gl88arDQgBDSyAsCF2xe6MZImC5m8=; b=XhsJ97LSUawmz/w2O2VgAeMDPqHxHvyFbeEz/i/yuSkHC7gX7fI46s6KLxJDvRAbP5nbP27Ymc83N7sP9AGk5XD6Bh8u/FyYHaG3jmRyn8DjN2CYJ8xj3BdqDktYz1DtCO1B+jcTnsByW1hPUU0J8bkNzsLoAwLBXirnPndIckxk0kPNrtyPWL8bCd3iUOTKp6fY0FmHt/sE6P8RfSGd2FP8AMBdLHN2H0kGgZmewGiHlEJis3OxRZ/yntZKN8F3mBiMsjk5BbyAK+1S4lx6ytdgmnb/YeEWkfOpyaxVk7DcyyrUDaLWXwMSWx7yavjSqy56WblvjwY7aiXIrpNPOg== 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=1Lq2oSP3SQ4bg5Gl88arDQgBDSyAsCF2xe6MZImC5m8=; b=VfrGU2ltuXRXYbG0s4kp0z+LKpmweYnD7sISM+8mnrh+BN6iiohIP3KptrOfQufnVioCQ58JSeJkbCBjRY1Kg8IZjfk6smshqkB/62/tZkIDepacZuslERH7VFRW9Z7VK0LmsL0FIGwHOSf3CH5lM+U6VC2ZymfZiQ8Ykxs7SFU= Received: from BY5PR11MB3973.namprd11.prod.outlook.com (2603:10b6:a03:185::29) by BYAPR11MB2917.namprd11.prod.outlook.com (2603:10b6:a03:89::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.23; Fri, 19 Jun 2020 18:18:36 +0000 Received: from BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::19d5:343e:d3d:e733]) by BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::19d5:343e:d3d:e733%7]) with mapi id 15.20.3109.021; Fri, 19 Jun 2020 18:18:36 +0000 From: "Ashley E Desimone" To: "Bjorge, Erik C" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" , "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-staging/EdkRepo] [PATCH v2 2/3] EdkRepo: Adding backwards compatibility for old pin files Thread-Topic: [edk2-staging/EdkRepo] [PATCH v2 2/3] EdkRepo: Adding backwards compatibility for old pin files Thread-Index: AQHWP3SHgT1NI+DAX0ObU1v15BetXajgTPDA Date: Fri, 19 Jun 2020 18:18:34 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.52.218] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: bd5493f1-0d76-48c1-44cc-08d8147d2eda x-ms-traffictypediagnostic: BYAPR11MB2917: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2150; x-forefront-prvs: 0439571D1D x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: cO1DtPL24ik3sfgJXo1lcdzY5wSb2noPWZMPMn8KS7XiV+yGSlV/qEKd6hrlS4e/yb6C4oxL/QfNS05Q4Tnx1Qkc8doICObyZBAZDhMVTobz2vxRKL4jVacESusmWVbIPNXxXVNAtwblK/dlipb8TfYfobe2ApuKDT2X/SnPuB1Sg0jK/XqzgyfgQm5KHKBEvgHHJPrTT3Z17NNfNJszOnQLgPn1kybmxGt6CLL9MfB8b9eeSL29qvo8T9Cju6ix7OX3j4pOQXe+VPcUlPdQK6SQxcoCU0vomMrgyq57VMKIBmF6y1ymoREKlObRHu5UpR6FFoZq1SftbN06fbxk9w== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR11MB3973.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(376002)(136003)(39860400002)(396003)(366004)(5660300002)(52536014)(6506007)(53546011)(83380400001)(478600001)(86362001)(107886003)(8936002)(4326008)(7696005)(26005)(71200400001)(186003)(110136005)(54906003)(316002)(2906002)(55016002)(9686003)(66476007)(64756008)(66446008)(76116006)(66556008)(66946007)(33656002)(8676002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: hXEx2rcxaAkXGsrWQxTJNKPTL+uNClNX3L+NQpnzJedyo6+wv088LDgsiohkDHVG9qIMDYhA9Hsiih21g1CG1LB+x0oHuim0PNwlg7iGtifyRc6v6n5n5U0oLo4LD9MeZKCsGIavWILuaBNOJ7CAHJfgIoIEa6+Nm7N24LBHtfj4x52ew1+FLF5MsbiTF+d+2Fiq2oR2zQXfRYIOmdNLTV3Kr3oaxkoxj3G/bQ+I4dhNfCSPQKwqmD7xVm4XitSK0hrAO1pxbWNyVAzkYhSzfghFa4tFWIlfAL3cgACYidLxK65npW9QnpDXoYF4TGfPBknweet/GziAVXtocyuHaFBwbroAPt0UTMcx7dZDI27hlseAUMV6h3jQ8LKw1OWfIOZYXQDp05UeQ/0MCL8ak+knp5IRg90lDz+8jcdIKx2bxfJt7ZjgIH86eteB9bANLJ8IzZaGhulw3PM3OIhHG2R+mnG26jZOQqYqewuKCJSdcwI4mnwxevddfgZg1QvQ MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: bd5493f1-0d76-48c1-44cc-08d8147d2eda X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jun 2020 18:18:36.0919 (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: 2u86/IWcf4DuVtMXSWTYHWnTsFVuclUiBcdwS4QNRIgkHMJRXREeQDojxlxrQNRztrwt2CwgGYZ2782sDYSBOgePH4LseDtKdxC1OZ26Gho= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2917 Return-Path: ashley.e.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Pushed as: a1ae934c28b5781b358a270fed77e35d23b205b0 -----Original Message----- From: Bjorge, Erik C =20 Sent: Wednesday, June 10, 2020 3:14 PM To: devel@edk2.groups.io Cc: Desimone, Ashley E ; Desimone, Nathaniel L= ; Pandya, Puja ; Br= et Barkelew ; Agyeman, Prince Subject: [edk2-staging/EdkRepo] [PATCH v2 2/3] EdkRepo: Adding backwards co= mpatibility for old pin files Older pin files used the invalid enable_submodule attribute. This has been= fixed for new pin files but we need to be able to support older pin files = as well. Cc: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge Signed-off-by: Erik Bjorge --- edkrepo_manifest_parser/edk_manifest.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/edkrepo_manifest_parser/edk_manifest.py b/edkrepo_manifest_par= ser/edk_manifest.py index adf6d52..00ad392 100644 --- a/edkrepo_manifest_parser/edk_manifest.py +++ b/edkrepo_manifest_parser/edk_manifest.py @@ -795,7 +795,11 @@ class _RepoSource(): # If enableSubmodule is not set to True then default to False = self.enableSub =3D (element.attrib['enableSubmodule'].lower() = =3D=3D 'true') except Exception:- self.enableSub =3D Fal= se+ try:+ # Adding backwards compatibility with p= in files that used incorrect attribute+ self.enableSub =3D (= element.attrib['enable_submodule'].lower() =3D=3D 'true')+ excep= t Exception:+ self.enableSub =3D False if self.bran= ch is None and self.commit is None and self.tag is None: raise = KeyError(ATTRIBUTE_MISSING_ERROR)--=20 2.27.0.windows.1