From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.74.1586198117461559101 for ; Mon, 06 Apr 2020 11:35:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=fcvZtRmC; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: nx/uwkpPa1kbImO9rmIJ6XOl2YcyIRNtW4pwCAboOY4CoKwyMqoRcpJNvj/iJrbq3KysVP0Jtu SYAhBwHAAjjw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2020 11:35:17 -0700 IronPort-SDR: U4o7lAfkWfLZGdH/yP9V/sp/dzO/Dt0+tVsvX5BzEiE5NwWIymZdDFamOQ+VVi4hjHTF8pyEJ8 Vp2A7Rm8ATiw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,352,1580803200"; d="scan'208";a="452164656" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga006.fm.intel.com with ESMTP; 06 Apr 2020 11:35:17 -0700 Received: from fmsmsx604.amr.corp.intel.com (10.18.126.84) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 6 Apr 2020 11:35:17 -0700 Received: from fmsmsx604.amr.corp.intel.com (10.18.126.84) 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; Mon, 6 Apr 2020 11:35:16 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx604.amr.corp.intel.com (10.18.126.84) 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 11:35:15 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.176) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 6 Apr 2020 11:35:04 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ycpq+dVojcR95N5p1i2APQ1p2/Z4vDG3YSivWJBsz1Ybv4q0JX6FgWiaPidmD1KqeRdpPiehFH5pSJ/7o+c7wkurzWmaL1EkU1XsUGUzwcrJ2WzGn4quaXCVncnqEEghtYcCPZ+IZfBkOc5j6GuPwyKOYQ0irGOW7v2jDpiuoRhIJ7PB5ScvWEKpyTAB/znz+C7/h1VHJpO3hVR1PwpiddDD729QRwcFsBqLB6dyYQTxPJlUuFiRAXzId0d77CBpU9memdQaNid9AYXPik4PDrw0eGBPIs9aoWppHEOwnjYgvRqopJzexn1ad2BVi8t06HfsoZa2hBw4dRmQs6K44g== 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=WY+CFeUkKKjrUuru/WfDvp80c6r8UrSXtG59qiEwcsg=; b=Eg/m4Hy+zpps3neKtmJhX+LwVr5wxzq/DnIMXRYXoMkIcMIYWoOOUMfDcPVqDNUHJ7eg0IwuxWfj1rzBilJuNwQ1pwqVtgwbkTJ/YRuykkOtMjAmWdnmV6SCecs5CPq3WaJ6Tj987SG94i09aUCcE0ET69zWYt6TYvl4Ov7x6Br+laOIYkfEdJp2hSdZ1OyoDhx8GlxHyMbZ+PN8BPFoXOJgMplDokjwuPGMFiHUdGiRd/oJLGnUktRGEvrmdERTfoTaH4QFdgpg7A0ALKRzHkmVsvCEZcPA5FPUOAUlp+0/CWalPytbp1uzB/a3MZltyaYQmFD9ZxDHtjgq5eXASA== 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=WY+CFeUkKKjrUuru/WfDvp80c6r8UrSXtG59qiEwcsg=; b=fcvZtRmCvZd5gL2tzHT8+u3I4ePpx15NcghJ+B9amiHrmfCaAsxqpHCCTW06+FmBmt5bR869V/PATwYkJBHwDY7AjN5Lu/oOkO0Y9BmldMzO7/Qd3NJ3XIc3HIs74PiyxY+PgneX444hZt83QKNcPErm8jrz6KtQw7FLRtt7Yjo= Received: from DM6PR11MB3628.namprd11.prod.outlook.com (2603:10b6:5:144::25) by DM6PR11MB4346.namprd11.prod.outlook.com (2603:10b6:5:1dd::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.15; Mon, 6 Apr 2020 18:34:47 +0000 Received: from DM6PR11MB3628.namprd11.prod.outlook.com ([fe80::5904:e7d9:f64d:9a7e]) by DM6PR11MB3628.namprd11.prod.outlook.com ([fe80::5904:e7d9:f64d:9a7e%3]) with mapi id 15.20.2878.021; Mon, 6 Apr 2020 18:34:46 +0000 From: "Ashley E Desimone" To: "devel@edk2.groups.io" , "Desimone, Nathaniel L" CC: "Pandya, Puja" , "Bjorge, Erik C" , "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+I9wChbHrp9E+rl2hTj9ugp6hsb+Ew Date: Mon, 6 Apr 2020 18:34:46 +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-version: 11.2.0.6 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: spf=none (sender IP is ) smtp.mailfrom=ashley.e.desimone@intel.com; x-originating-ip: [192.55.52.205] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 10f3e042-2cca-44fc-d5f3-08d7da592ee4 x-ms-traffictypediagnostic: DM6PR11MB4346: 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:2399; x-forefront-prvs: 0365C0E14B x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB3628.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10019020)(376002)(396003)(366004)(39860400002)(136003)(346002)(53546011)(2906002)(7696005)(54906003)(8936002)(4326008)(8676002)(966005)(110136005)(81166006)(81156014)(86362001)(316002)(55016002)(66556008)(66946007)(71200400001)(66476007)(66446008)(64756008)(186003)(33656002)(76116006)(6506007)(9686003)(26005)(52536014)(478600001)(5660300002)(6636002);DIR:OUT;SFP:1102; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9TcXYrP+UCfD2mLAAnM/mPGKiAxi/HQItxQf+7ejzp61rHLaNsmRp8Bd+M04ezOKkyf1YQdEIXtETlnyrlTLtBRjuE2VzPrfP8kzzD9U5D+F1zxSyIhsX4yovYP/f7hHdjr/zgoobgg0QbqfrFaa9c3iZjMkZp6KXW/JIqyUfjBO8vvBkhDUl/5pSeHPN8PO5fG07KVtOLJjHUiMgzyxy5MaKD9UqZjejeldGHlnyoavsYAfm41CZ/idzI/mk/TFz+zCxdnBn7laEc/OsHgU3k4VyUALLZjaEojc1ry+6NZojqVnxm8ow4e0HK+7BqSWa0lUYyztg1PyhuEzUZQynkicgGsUEda+oIUUMMHTjx7/svBwS2tPlhef1GBingAjdDaXfFqIKQJ/GyYK3g6cIEMm+vkDSQ1XPODS1dMifjjzgzTiAd/cvOzdeKsg4S8PfapdyPiJbSx4yJQwBILeT9WIKP6pPK8zZi0GgoL5jyiWjyE2yGsjqXSPchSEiTDxZS4DVghEK4KnTmNlIzEb+A== x-ms-exchange-antispam-messagedata: MGg1/beOgTXTXQuvCxDRzNqkap/EZCbuhAm6akLE6Al3olcSY7jb2YGtysX8gNZjWQ0pbwjF0AWwbFS5C1k0pky/O44exLzIUFGWBkh91IHvRxBz0kvstskoJ0phemZu1qYry4IrZgO+Onsly5sQQw== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 10f3e042-2cca-44fc-d5f3-08d7da592ee4 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Apr 2020 18:34:46.8788 (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: s7z/ddB6n/yIsPsNYn3S14GRLOt4rOTDCBgrrxeE9kEMX2GTPDy0qcRgR8fALp/JtZ+YaamNfBMaGIn22x+pNLJPlTm9iXL34ahHWyJG/RM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4346 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: 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