From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.1188.1585779050592260753 for ; Wed, 01 Apr 2020 15:10:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=V8OAXSv7; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: bopqxS1SQGiiPqkpDW55IwkqJhKpE/G6PqZq0rpmfau0UM+ne8ZLdTPZrWEygFmUhB9bUiSEnv L/cSpbwDac/w== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2020 15:10:50 -0700 IronPort-SDR: BrCcO4jOyBCEu9vY+Sfn6KjUbb98QCoVqMfGlPMLZ/xTxFxm5XpyQu4/zJlSVkwBvvgrT8wrY1 69JyOZi3XuIA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,333,1580803200"; d="scan'208";a="252791330" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga006.jf.intel.com with ESMTP; 01 Apr 2020 15:10:49 -0700 Received: from fmsmsx162.amr.corp.intel.com (10.18.125.71) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 15:10:49 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by fmsmsx162.amr.corp.intel.com (10.18.125.71) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 15:10:48 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.104) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 15:10:48 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DcXMsB9xkKYsItsJ7NVVq5n/lrTjc+3vX8Y37p3ZmgjeZOjbtmliy8a93XWYyfmPlKXSj0EgGbNKmGnx/ZpbMbyRHzia5EiB51NPVrhba2R+TArsSwL/qU2svjNfBOAiBdkkhnljmZ/P8KI4W+ZzmOpgPDGSW2ZTxXjuARHICMEQ7eA4kzL/emqd3HhK5MyC+w5btce5ricU6B0xbm2eI7uVyDHj8cxkMGIqMKzVkv/BMdDVIIm/R0wvKQvCCrYe67nvnqAgRD1h7i+3qPus9ZA/I4cLu6kdDsh3hjTeEj3ktU3Wu4oBXjF3CIX3fmKBH0iojR61i+UQKF3ZkZ8+WQ== 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=XlzLg8EaUgywoMTe+94TW19hylbc7Z0zYD9Wr79zwqg=; b=YF0p7wHuhrPIAXiiXAbOpaX1dCdOboSo74w7v/aY4z75uCBsIS6bIol5ij7hVxaJPjN8wS3pQxTy7A2QxwDd6PdjQSejFxUtlQajSgK48TXk8AtdKAzbjt8/h/q6/ZKIIY5eG0eGiHIe4XRVNyvfmVwOrIwXUwkPUag2mtesYY7za7sV3zSrkthDFJLjGdlnGFuEmkSfwsjxrqR5j8TF+9woRibGPI/l04i8IxQXdJB/jpU8JNi/3H8tqtb5QRWmEXLuA0kMs2RPjOnoBAmlIqjjecANSRc1hRqgexQexVOFcAl7rMyJNgLVgsU5xAG+pjVZuP6se5Jxutuhe9NRIw== 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=XlzLg8EaUgywoMTe+94TW19hylbc7Z0zYD9Wr79zwqg=; b=V8OAXSv7P3eNRAf5XS4ehKE7N0HlDLbt757aiyBD+IU6rGp7RO3IXj5hP5eAJHwE8r2bh+J/KIn04mMjEkY+TfLO8dQmxhqi8Aopg4n2gbg+e6p4Xyq1T/nBQa03F7wKSAvWgby/ftp9ecLFqGafP+oGd+dmpXFsjW5HBaOCTiE= Received: from DM6PR11MB3628.namprd11.prod.outlook.com (2603:10b6:5:144::25) by DM6PR11MB4299.namprd11.prod.outlook.com (2603:10b6:5:1df::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.20; Wed, 1 Apr 2020 22:10: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.014; Wed, 1 Apr 2020 22:10:46 +0000 From: "Desimone, Ashley E" To: "devel@edk2.groups.io" , "Bjorge, Erik C" CC: "Desimone, Nathaniel L" , "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 6/7] EdkRepo: Update clone for archived combos Thread-Topic: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 6/7] EdkRepo: Update clone for archived combos Thread-Index: AQHWB63O4xVvuKr9hUa92AWcCuV+rahk1ViA Date: Wed, 1 Apr 2020 22:10:46 +0000 Message-ID: References: <690979cacc2b662971cc805eab44bf74562e7236.1585694095.git.erik.c.bjorge@intel.com> In-Reply-To: <690979cacc2b662971cc805eab44bf74562e7236.1585694095.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: spf=none (sender IP is ) smtp.mailfrom=ashley.e.desimone@intel.com; x-originating-ip: [134.134.136.213] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: cf2b79a0-7b93-4240-8dbf-08d7d6898786 x-ms-traffictypediagnostic: DM6PR11MB4299: 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:7219; x-forefront-prvs: 03607C04F0 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)(366004)(136003)(346002)(396003)(39860400002)(86362001)(54906003)(71200400001)(66946007)(186003)(9686003)(76116006)(64756008)(26005)(110136005)(66446008)(55016002)(66556008)(66476007)(316002)(52536014)(4326008)(107886003)(81156014)(5660300002)(2906002)(53546011)(33656002)(966005)(6506007)(15650500001)(81166006)(7696005)(478600001)(8676002)(8936002)(6636002);DIR:OUT;SFP:1102; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: IeyuXepIHHPOQSVS7Rt1a+PIEfgny6nDKq1qmtgQJvRtxyAMZ4gVnqZ8egXMltl0WJiHS8j8qxu2+rsTAdbsyfd1v7+zjjP7EKvBhPe5BPEDPYw4VFzu8a9xrXx0FS7K6nHTRQmJCZ6cQRza/oEAmSkYOFCmm802XLvEmHFCEajUbNwirihLweyB6KMA4FoN9qg5uo9pGzpfclzDgRE44O2taKluWkJUZTkFZLYDfiayxIux+yJWuy22yRlcmVhogfb56AaBvPOtyloOg9ts65QTw5RIDlJUoAj259NnvxzfezoNOsQcGHNRWrl0bejwGlRpJvXzemr/xV/7v6lt1JLnGgtaAmyiQXhYl0DNqJBES6IdL9yVp9VprDomSXpipOJ/PvKiZi1J43D6g5zw6lSyQDG2pxdkgzoGo5RSZxbfu1S7ofB0gb/LIAE6GdI6/vUNhSFKwl8hr0VdXPcMV0mh8Vht7oHFLejoANEbDnO8cLhGUxqZ3Q8fM/De+wlqvB39mr+kA0bevXcZcTfgTg== x-ms-exchange-antispam-messagedata: vGZ/v46YqLgrr01Ul9gm97vtg4f0EUvVy7URX0C3cK9UxADZqWfbC+QzlH0tTlvQWfOT9v5SxdQgsqi7Yjnf/9ngB5/tU8u7HpLqns0vyLO/MeYwk7jffgxvX7EYS/TV091YWd9uxOPP6sAJ2+ycNA== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: cf2b79a0-7b93-4240-8dbf-08d7d6898786 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Apr 2020 22:10:46.7820 (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: 6xYpMNOhb5kug3mqrgcItG39VZNBGz7JIbZAhjc5vqfbzrWP4PSZGd/LBeQQRLjDof4YzaO6CoIbmbI5+6V1POQPt3FFyqPe6v4qa3zXjMs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4299 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 Bjorge, Eri= k C Sent: Tuesday, March 31, 2020 3:42 PM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Pandya, Puja <= puja.pandya@intel.com>; Bret Barkelew ; Agyema= n, Prince Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 6/7] EdkRepo: Updat= e clone for archived combos Adding support for archived combos in the clone command. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman --- edkrepo/commands/clone_command.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/edkrepo/commands/clone_command.py b/edkrepo/commands/clone_co= mmand.py index 2400272..701a853 100644 --- a/edkrepo/commands/clone_command.py +++ b/edkrepo/commands/clone_command.py @@ -3,7 +3,7 @@ ## @file # clone_command.py # -# Copyright (c) 2017- 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2017- 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # =20 @@ -16,7 +16,7 @@ import edkrepo.commands.arguments.clone_args as argument= s from edkrepo.common.common_repo_functions import pull_latest_manifest_re= po, clone_repos, sparse_checkout, verify_manifest_data from edkrepo.common= .common_repo_functions import case_insensitive_single_match, update_editor_= config from edkrepo.common.common_repo_functions import write_included_con= fig, write_conditional_include -from edkrepo.common.common_repo_functions i= mport find_project_in_index +from edkrepo.common.common_repo_functions import find_project_in_index,= =20 +combinations_in_manifest from edkrepo.common.edkrepo_exception import EdkrepoInvalidParametersExce= ption, EdkrepoManifestInvalidException from edkrepo.common.humble import C= LONE_INVALID_WORKSPACE, CLONE_INVALID_PROJECT_ARG, CLONE_INVALID_COMBO_ARG = from edkrepo.common.humble import SPARSE_CHECKOUT, CLONE_INVALID_LOCAL_ROO= TS @@ -99,7 +99,7 @@ class CloneCommand(EdkrepoCommand): combo_name =3D None if args.Combination is not None: try: - combo_name =3D case_insensitive_single_match(args.Combina= tion, [x.name for x in manifest.combinations]) + combo_name =3D=20 + case_insensitive_single_match(args.Combination,=20 + combinations_in_manifest(manifest)) except: #remove the repo directory and Manifest.xml from the work= space so the next time the user trys to clone #they will have an empty workspace and then raise an exce= ption -- 2.21.0.windows.1