From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web10.6892.1591830411781549269 for ; Wed, 10 Jun 2020 16:06:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=L/lBu8nt; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: z+ONnR/ld/70lWiIZ0L8pu2lM37yNwjetqRIpxH8Znk4TlsA4QuDboHY4EbBdlol81aaoa/bmu e6BpY4JtcDyA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2020 16:06:50 -0700 IronPort-SDR: wuypPoK76tsOasZBd3MzVZZIY/a7dJ1qNTGR78qa8pi9RxmIJrh+ufbN4iycsCIdo8/nlk6ZXt za5oRJymElWA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,497,1583222400"; d="scan'208";a="275140569" Received: from orsmsx109.amr.corp.intel.com ([10.22.240.7]) by orsmga006.jf.intel.com with ESMTP; 10 Jun 2020 16:06:50 -0700 Received: from orsmsx162.amr.corp.intel.com (10.22.240.85) by ORSMSX109.amr.corp.intel.com (10.22.240.7) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 10 Jun 2020 16:06:49 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by ORSMSX162.amr.corp.intel.com (10.22.240.85) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 10 Jun 2020 16:06:50 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.168) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 10 Jun 2020 16:06:49 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LfiFn9GaDkzg72C15DRlxgKQScV4x8AkWla8aTvUtBqLpED8TJoZG+I2Obyc5y0EJ1RC1EQbq4vfTdlyc5V+rHTKoFMasV2jqUr7npCpzzGNP4qv0c03q7nmF03s5S4glPCdebb9OpQr4sdBjFit24yKZllOmlwr4lnBcJfUkGOVVOQ+9a9IUNZPkaOevB/Lj7VKHLWFjzqkF8rtqJOG0hYeQnuZUfT/PPgPSaKuPlhhh8mC9HlUQVqtB632c7YPBKI7znKvjl8tJ0euQ95zi6CmKUcPUOTgwj9Pnh9iiox6DgLJYiOPpG6ZvO0h12tTMdJgBYi7PW7O5xF1M/WaAQ== 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=n+eVQQ/VwTUXwr4Vx8bcC/nnmLed3h4t7Akdkk1+LXA=; b=MiD3fxWw4MBwKZEwTuBfghXcuTE1sm81J1qCAuHl7AsUeB0sQj9ewgaoPROi8X+aeza9dLcl/wbdEIyUl6mYxDMETq5DFwOTO50xGXphp199LGS5u/IL5cbQ31gNe4hlrYSina0nPj/wbR9oB8gub33+CEm8HLlgr5Wu+EZynk7rPemXN7m8xIT68WGyVd5YWED7xQcZ8XLa4jF5zsnBLc+TVbgfd4cXNYGOZRxowE3cFhqfIP3BxLC/PZN/nY5+VquNqrdljD/FOiiZaPBXmrus2FV2sTQfbyB3iqEdepu2ocIEZZ+tiI3d1ail4sNFVOcobCUgF5eNhmq7s2yPVg== 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=n+eVQQ/VwTUXwr4Vx8bcC/nnmLed3h4t7Akdkk1+LXA=; b=L/lBu8ntPcWCB1qion9N2PNL+TxK8P9d/DCIhojj2WfoR3kWiZktUm69pI9BZ5/3QPh9Sc6TBanvuLk+xDaAgr/ipHopaFzJd2K+1ydz46VdIdDja4K8WDQowJaV5tCnCcp/vlYyb1Xqrxlk+Fp72CQXHYEq0S/Fw0RRiUo8afE= Received: from BY5PR11MB3973.namprd11.prod.outlook.com (2603:10b6:a03:185::29) by BY5PR11MB4037.namprd11.prod.outlook.com (2603:10b6:a03:188::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.19; Wed, 10 Jun 2020 23:06:48 +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.3088.019; Wed, 10 Jun 2020 23:06:48 +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 v1 2/2] EdkRepo: Adding backwards compatibility for old pin files Thread-Topic: [edk2-staging/EdkRepo] [PATCH v1 2/2] EdkRepo: Adding backwards compatibility for old pin files Thread-Index: AQHWPrJanq4p1IEwOEupEdYGc2lsJqjSehdw Date: Wed, 10 Jun 2020 23:06:48 +0000 Message-ID: References: <8f672799cb0b3471d68146a351ec20b441e34ce8.1591743203.git.erik.c.bjorge@intel.com> In-Reply-To: <8f672799cb0b3471d68146a351ec20b441e34ce8.1591743203.git.erik.c.bjorge@intel.com> 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.198] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: eb965b9c-f859-45d5-fd0d-08d80d92f426 x-ms-traffictypediagnostic: BY5PR11MB4037: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2150; x-forefront-prvs: 0430FA5CB7 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: DgNt+uEE41UmYbn1kYUhnGLG2NRLGO0W0rZA74FhQocaR5b0kI65Ujq2upnB/6PeUwgWupXe+dweSQKQD7NXcdATcG028JFKk6j4WuOhRwdAV3AXtdZvZJXG3zLRAIX3X0mPX4hl0YoyKtgTdwTFqEu+Mnbc7g8z9hPDR37rGZ4UjaGMaY/9kv4W0xxCQTJDV+Hdzr3Nf9S/VM88aaTpu1y5vUnqlg2rQ5s8RtoHKGLAYoiWpFWVZqRpyfNtUIOn+gM+u7a79idKxW9nQpFgvY+xedgAg24pyuT1clIQ0pikaw29ugKRNXA5KxXd5N6W 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:(136003)(39860400002)(396003)(376002)(366004)(346002)(26005)(9686003)(55016002)(5660300002)(6506007)(52536014)(53546011)(8936002)(186003)(7696005)(4326008)(8676002)(316002)(76116006)(2906002)(86362001)(107886003)(54906003)(66446008)(478600001)(33656002)(83380400001)(66946007)(66556008)(64756008)(110136005)(71200400001)(66476007);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: KqQne5qZg1uAi6eAAmVIe0Gv3Yj2rnEAfOqPPPOcqHhhJNrFNumMU0prjXaDYHzc/ivlvMLl0eh0y8bdliVCqCcfj3sIiDn3w6TVzZ7lLv61iL9YNhRCcmVmgj+/I0a2/y2cCrXSPNmLlYErgxT4QdTffJkJN2ho/cVaO7CgZthxOQlxrWABYFQAmGoyQgdcj6XzzIOU5560AKFmgnzar0a36nNZKUNmwt4o9AXQsKJJILZYyGQ1UtFNchrvmKFeVgYzPsahZut9RPKfM2B0f7+FzJLmNAaS4OGq5B7FfASkyCvcXWbFoaU0FlwYahgrYCyluUZq0Iz2Ldc7ojoLctcG+/A6YSm4hpUC8wwA8S0fm18eKaes2x4h/gHFRrnFEnUmbEg/imJ+NFl0SG/iZEzKg8NLAad7pwcSn/x3JnF8ga70WYEcQNzD22IMZJYi0JxnCJbCFwLjuLx8Erd/M4hGqnDK2sk9ntN7JD8yvRS6XerT2yhUa13O4Uku2Zyr MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: eb965b9c-f859-45d5-fd0d-08d80d92f426 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jun 2020 23:06:48.3758 (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: DOHdCbZaPzMDvFxhQyRCoEiSTtuUJfnphHOXHJV7rOP59WMJWHonSUCsFHmx4Sl72zMBaS1vmaET2KghbI4nbwHNYZJivF5k2kIa0iL7i+w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4037 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 Reviewed-by: Ashley DeSimone -----Original Message----- From: Bjorge, Erik C =20 Sent: Tuesday, June 9, 2020 4:04 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 v1 2/2] 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 False + try: + # Adding backwards compatibility with pin files that used = incorrect attribute + self.enableSub =3D (element.attrib['enable_submodule'].low= er() =3D=3D 'true') + except Exception: + self.enableSub =3D False if self.branch is None and self.commit is None and self.tag is Non= e: raise KeyError(ATTRIBUTE_MISSING_ERROR) -- 2.27.0.windows.1