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.web11.15229.1586191918699056551 for ; Mon, 06 Apr 2020 09:51:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=wuEbum2u; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: erik.c.bjorge@intel.com) IronPort-SDR: rlSVBeC7Yj2QbJ03sjfmwJS0JZeBu5GpmJ9v60ZpwACc2Dhm8GHk+Ue52lWyczQPZ0NPyxZuNy 7tMe69zLhzNA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2020 09:51:58 -0700 IronPort-SDR: 7rfq75Op3h/BEcZ32w/l3iEzg7VbJnwfp1F7z8dRBPOylUGIwAMQmLON6V46WbQz5zg8BOQRyw gs+v7V0JEEYA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,351,1580803200"; d="scan'208";a="296705836" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by FMSMGA003.fm.intel.com with ESMTP; 06 Apr 2020 09:51:58 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 6 Apr 2020 09:51:58 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 6 Apr 2020 09:51:56 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Mon, 6 Apr 2020 09:51:56 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.108) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 6 Apr 2020 09:51:52 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ElCA/WC0PY9OgKkZtFKz2QF+fqIk6SCtebjsDgMlY9nBQcIBZiZaLm18vltOS1qIYQvQ2mRLT9v0zMf14kyQBmNDskI2NC1rHi/E6wVSiexIg+OGaQMsuzijiET1yDykX6+9lRKv1CsFYE0GXEJM/ucLeH/rc6haOx9ETPtzPzP4KMO4ky72y5t9kJRPjJ8Sb50ys4bBFlcMl4nuZ9VYUKml8/SovTzuj9OU7nyEVBMfhkbM6LTrYFLQZSRZq53HkxwgjjHXpl1weXr3z1FhttHKtfPLyIdyvGazdq07JYfhku3UA11jcC1y4su2dPvllay19qnkC6KSqnz2mu5wDQ== 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=M69DDkeHc3IH9xFQSBAP6cLHVdNuOlJEMVYUIQ0uSww=; b=QBCzqxO8Wvz3nurKt6ZGL/hgXzCBlKvSeYotv7TvAPm23+fnXoE01lwlXOhn2imUyiMd0gmang0rQTKFAlk/B/JgBo+Py2nkKLt0fQultcy6geeCopGtUH95QLI0HPsWG+C592SMb3E05n63BUD0H687mL/Jy/EWkSxNyg7updpniWa8rBu/gptTukKV3kAdRdudQNbka09lLH56XZfuQsUSjTQ8BPebs6qFmeDPJc2BkNdD9S9KnxgBNEe79eADk1IBcgHls2/LNqPFu11AVP/SQKnVFjlfu1uA4lkHk3Kg3STQppnar2xi+v7HUFSLrxNDXLXzYxfPUjsUD6mCyg== 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=M69DDkeHc3IH9xFQSBAP6cLHVdNuOlJEMVYUIQ0uSww=; b=wuEbum2u39+wiQIZtla+Up4oXnoAgXBTypgI+jDKz7Ou6UNmJ/oqvoIw/HEYGhbFtwuwKPj7If5MDytGFTmJE69f9YZqroqHCvNf95OdK1J5cWo8cD2fyP10NNT1IElPnMysV1yAYigNxt6LvLndzVPwprnGAgxMtR2m7if2o9c= Received: from MW3PR11MB4554.namprd11.prod.outlook.com (2603:10b6:303:5d::7) by MW3PR11MB4729.namprd11.prod.outlook.com (2603:10b6:303:5d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.19; Mon, 6 Apr 2020 16:51:48 +0000 Received: from MW3PR11MB4554.namprd11.prod.outlook.com ([fe80::ed52:bf5d:a3dc:7252]) by MW3PR11MB4554.namprd11.prod.outlook.com ([fe80::ed52:bf5d:a3dc:7252%7]) with mapi id 15.20.2878.018; Mon, 6 Apr 2020 16:51:48 +0000 From: "Bjorge, Erik C" To: "devel@edk2.groups.io" , "Desimone, Nathaniel L" CC: "Desimone, Ashley E" , "Pandya, Puja" , "Agyeman, Prince" , "Bret Barkelew" , Philippe Mathieu-Daude Subject: Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Checkout command is broken Thread-Topic: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Checkout command is broken Thread-Index: AQHWCg+K3bgai9Xgr0etpXeEQbpCG6hsUv2A Date: Mon, 6 Apr 2020 16:51:48 +0000 Message-ID: References: <20200403232723.2377-1-nathaniel.l.desimone@intel.com> In-Reply-To: <20200403232723.2377-1-nathaniel.l.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows authentication-results: spf=none (sender IP is ) smtp.mailfrom=erik.c.bjorge@intel.com; x-originating-ip: [134.134.136.221] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7382b9b9-f54c-4931-a086-08d7da4acbfd x-ms-traffictypediagnostic: MW3PR11MB4729: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5516; x-forefront-prvs: 0365C0E14B x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW3PR11MB4554.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10019020)(376002)(366004)(346002)(136003)(396003)(39850400004)(478600001)(71200400001)(966005)(33656002)(6636002)(76116006)(66946007)(52536014)(26005)(66556008)(8676002)(66476007)(64756008)(81156014)(7696005)(54906003)(110136005)(66446008)(316002)(81166006)(8936002)(86362001)(186003)(53546011)(2906002)(9686003)(4326008)(6506007)(5660300002)(55016002);DIR:OUT;SFP:1102; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 6dVLt+LL5oJtlyaKyDyaUk64tDjsD+kElwP8Zwup83IUd3giECljCKnDzEdGYWPpBpVqQt0M/WTdZRDb+UeRZuC2WGXAJCd/9EsoWMb008mKLQ4/BP/s7+OV/ff41f5/iCkSwxH713c/JdvhGJZclqo/AwvaPXvsMFPkQHirziD9m5+wL6rWKliRVER3q+Z6PBIlWyDznRKOmcpflOpxyNiZnkdNH2mG+aiKg0yBOU6Dl0Wkq2hfyS7sKFvzIdRVT5xjxo81OzcIM4skWmUpYMbVOd8GStg13WavqqUwVWNWZ/7xJ4PSqi3MKncD75lx+Jjl5mXUdA7g5B8pyYJylvn4dolcLf+M60apbDM/ETY8byPhKhRPVCe30qpZ8bz8CvX/9D1LJmg+MF92zWLIifx2X9hJctr1Q7grRKF27Aejw6BhJRzi+SSLelISH3btR+msTSr6uvnOg522OZhLqLJJcRGS/wBTlOv8n5dAc8Bb4LQ0wUPwF637vSYqr4ZoRefVCmLLr5Sh5/4bIoR5pw== x-ms-exchange-antispam-messagedata: 64XdDlaIeeegXyhW2hgGp+sMd1iPSoTKxWfDvnBXCAOojShI1t8+iJbjjVd0T9xlXahYvV1e2QB7faSn1pXeOmSV52DKKfjCnD0NUVWKNPxEvpJDW5whzyFReC5Yyz7fNml3gBU/vxLfn6FIOO81Fg== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 7382b9b9-f54c-4931-a086-08d7da4acbfd X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Apr 2020 16:51:48.0518 (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: eyuzljH87Y3IzLmfgwpwJMFjDOXTxK2FdZTz6J1r0ELwuODP8h2PUBvMn01A75k59/ZCXzEQ0sspiEkr9TL9wQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4729 Return-Path: erik.c.bjorge@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks for fixing my mistake. Reviewed-by: Erik Bjorge -----Original Message----- From: devel@edk2.groups.io On Behalf Of Nate DeSimo= ne Sent: Friday, April 3, 2020 4:27 PM To: devel@edk2.groups.io Cc: Desimone, Ashley E ; Pandya, Puja ; Bjorge, Erik C ; Agyeman, Prince= ; Bret Barkelew ; P= hilippe Mathieu-Daude Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Checkout com= mand is broken Fixes a bug where function call to combinations_in_manifest() was missing = a required parameter. Signed-off-by: Nate DeSimone Cc: Ashley DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Prince Agyeman Cc: Bret Barkelew Cc: Philippe Mathieu-Daude --- edkrepo/common/common_repo_functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/comm= on_repo_functions.py index 160127b..0d39291 100644 --- a/edkrepo/common/common_repo_functions.py +++ b/edkrepo/common/common_repo_functions.py @@ -563,7 +563,7 @@ def checkout(combination_or_sha, verbose=3DFalse, over= ride=3DFalse, log=3DNone): combo_or_sha =3D combination_or_sha try: # Try to handle normalize combo name to match the manifest file. - combo_or_sha =3D case_insensitive_single_match(combo_or_sha, comb= inations_in_manifest()) + combo_or_sha =3D case_insensitive_single_match(combo_or_sha,=20 + combinations_in_manifest(manifest)) except: # No match so leave it alone. It must be a SHA1 or a bad combo n= ame. pass -- 2.26.0.windows.1