From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.34370.1589764957232342625 for ; Sun, 17 May 2020 18:22:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=FV4wLe06; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: lRpOB9cGvUNUy4cjNCS9rovTjkpb5aisuLlG8hhms559uK4yBQr9dZrjcp3N7PuI/dFNArNujl 0t4rviSM0ykQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2020 18:22:36 -0700 IronPort-SDR: 4C1aOtFmTs3nn/qj/v1cB08PNPvBZ530L1CnU839bZh/WbP/lih+ZQFglpKcVkaISLqwxvbGge xbVasYmhwMVg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,405,1583222400"; d="scan'208";a="411089431" Received: from orsmsx109.amr.corp.intel.com ([10.22.240.7]) by orsmga004.jf.intel.com with ESMTP; 17 May 2020 18:22:36 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by ORSMSX109.amr.corp.intel.com (10.22.240.7) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 17 May 2020 18:22:36 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.102) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 17 May 2020 18:22:36 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RL39axJyk6YqNbaHEKuAn5K+2QMsshkax5Qh8SRzXolDhQk8tt3rL3iBiinqyUJ0QH8+Nw5O6xCx0pPHnAE+fi7GCa2MfKhCezoI3PM35LrSE/U4hh45ynsF3+xweBbhqDrY1nurhhUmYJdwseuo/dLNvq+4uu3WOld0eyTHQ6DCirBO8qyW55I2OT1VasbmvwDbmb1wqVsygGp5v4rXkM/dnRbUhE4CH9cXzj5jLmOY8xVGGv5t3PzHOmpJW0Y5C1QA9Bdp2PvdmMI0QDMUxRpw8agFgsJc+Piw4BatlvcXgfvTYBTPXJSAY318hh4HlvIjVfOhwabtTfkVqIGRJA== 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=FTPM2yImd9x5b0Rt3Ot21p0Kei59HWM/Af5cxW50xiU=; b=lazHBy1WJNSvLwQFNpMaoIoCH4Rb6BezkEESnEPqZvYHVM0YPqcB7QhQsTDQSLhat1+bSTZTyhbXCdv+saRZ2L2aO4jWbuEeNqovjA3TpLpNlqquuQaiGoutaI80IrETIkBbRjfU2E/7syU9fXDpIxBOO4AmZZrRJdwIJSOC/CVtd5uJfOBm5BM0F5SonAAtP7csnlcBUCZ1BiYiQNVU0PRIzqZjstPctVx+6QvFkyidt2L1sZmv28Ggxh5DrpGvM/fyFofVFcgfeRfLq++38BexFRrbvKTZW50tGsPkOFXbiQE6uOa5Vt7F7D3uyGoKduFswQ/NWlcUIeMSwXUKFw== 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=FTPM2yImd9x5b0Rt3Ot21p0Kei59HWM/Af5cxW50xiU=; b=FV4wLe06lG2GzOFg7ImFhhUVE0M9zPyvZWHEO8U3v+2Njkg8xFxXmeFhLFbjBpHQRcRgHDrDt/wE1ddHS64HOWXVfhnJv/Mx2g7RifcYN45KyX+eez/dpGOrp8gd4RcmRY09RFl1IVhiaCIY5Ce+t/uGmKc5ByfgYOpRKE1Ag3c= Received: from BL0PR11MB3489.namprd11.prod.outlook.com (2603:10b6:208:75::29) by BL0PR11MB3347.namprd11.prod.outlook.com (2603:10b6:208:2f::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.27; Mon, 18 May 2020 01:22:34 +0000 Received: from BL0PR11MB3489.namprd11.prod.outlook.com ([fe80::d0f8:bfd7:bae2:3e42]) by BL0PR11MB3489.namprd11.prod.outlook.com ([fe80::d0f8:bfd7:bae2:3e42%7]) with mapi id 15.20.3000.022; Mon, 18 May 2020 01:22:34 +0000 From: "Nate DeSimone" To: "Desimone, Ashley E" , "devel@edk2.groups.io" CC: "Pandya, Puja" , "Bjorge, Erik C" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-staging/EdkRepo] [PATCH V2] EdkRepo: Only process the checkout command if a valid combo is used Thread-Topic: [edk2-staging/EdkRepo] [PATCH V2] EdkRepo: Only process the checkout command if a valid combo is used Thread-Index: AQHWKlAIEYmQu8eRp06p2qz5yrxYDqitEIYw Date: Mon, 18 May 2020 01:22:34 +0000 Message-ID: References: <20200515002958.12432-1-ashley.e.desimone@intel.com> In-Reply-To: <20200515002958.12432-1-ashley.e.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOWVhMGU0ZDEtMTU5MC00YTJjLWJhNDUtYjEyMDVkY2E3ZTVmIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiYm5scmVZb1ltUWRRazcyVDZBbll1YnkzeWRDOCt0bkUySWNBRmNqUjlTV2pOR3VYYXV4UFpTa2VFQW5XeExneiJ9 dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows x-ctpclassification: CTP_NT 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: [50.53.190.176] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 49db6d78-2ecd-4fe8-7cf9-08d7fac9f18d x-ms-traffictypediagnostic: BL0PR11MB3347: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5797; x-forefront-prvs: 04073E895A x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: sT6Rp38n//T4+JpjL9cSRRBKyS2PaF7wjlXsS9g8Q/hvIMbtjEXHTYsWIJPDMWu000sRS6fhC/wcrUvQCwPSVEC2BOQxNS4s8exY24zqCHnVTwWHImxXKUR1tLMMLoLXJqLw4JCsHXun6zs5/LrPF9YkXvCm6rfIOBhL8aAuhtUluk4zvLJlDVBIre6H57FIOPND2vOgX0o0C7Ralo/CI2ZdjgffAcMvf6d/vgiYfCZCPRGujPrSif4ROc2kLDTvTzpzs0aKFrixobAs8LljLcvLQMPwUtP8pemfxEE1MGGYaExs/KDqoUe/9WslXB+KG5s4WAu9nUxeAjpKJZNWAEa5WtuiCJhS/k9bA5H/pNO5L2V9j1o0S6eP8NtvWV135ajWThYLn0obwVEXtO6N3ZTPcZzQCDSYPKR6oLQVp3oiOxz+2hjBu1U7ZG9PzkGrWFQDxxyflIf9CG5/MiF6jul/pVwQo2o1kDX6a+lMlb7M3DTqRh+3TLA40wTQmp1X x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR11MB3489.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(396003)(376002)(39860400002)(346002)(366004)(66556008)(107886003)(54906003)(66946007)(86362001)(4326008)(316002)(5660300002)(478600001)(55016002)(9686003)(76116006)(52536014)(8676002)(8936002)(2906002)(26005)(64756008)(66476007)(66446008)(186003)(110136005)(33656002)(6506007)(53546011)(71200400001)(7696005)(14943795004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: s15UgfT5MkgNY2nUZREpWGDojKVf0jUw2iRJBnOAtp2stbDN25NDSGp7ldNgVsxdNFyJfIN5mGsIVaUeWfnYdgfnQAGRYaTi+uI8P6H96ctgPTd65AawHffJwp50xO3mzOwF24HkXWuMq5DAeIlt6b3ZIHbKQrGD5VqWydSrxmOuJXfGmiU8XGGpM/1HoD6Miw92tAM3H7PtZV9zlKBBYwz8SYWyv8a/qU1JnVhGyCwRXIapeiIi02CTPBij2kGAx+BWl3Gh7DO3GdHj4rjvimoIX3xIlDNHXSBm+IXyWLzPVR6QB4XwUuyA50CIwv6k0wK1PgppZrQ/csbfnW1QIyv5a6mw72PufaAcQhOH+1r5ZPaP2Y3nERnk+B2cpyalVTPRUeljJs+tlGu7ByyItefLNhB832myG9IdI8pAOW3ob7vL7k6FeFsrxy2RLguF1t+warKm/pWPq0on2y+JAhgtKddOch4mVutMZop6tcA= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 49db6d78-2ecd-4fe8-7cf9-08d7fac9f18d X-MS-Exchange-CrossTenant-originalarrivaltime: 18 May 2020 01:22:34.2697 (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: RVveGqcndXADXhMQJLcIAY01KPujsGTLeU4TPIfp7KMl6Ecu/Hd05OZIcFv9WTGRSvBs5QjNKoIEfBiCVZPeMrO8k+1ncCqHikfS1SoJLyg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3347 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Pushed: 102fd2e2 > -----Original Message----- > From: Desimone, Ashley E > Sent: Thursday, May 14, 2020 5:30 PM > To: devel@edk2.groups.io > Cc: Desimone, Nathaniel L ; Pandya, Puja > ; Bjorge, Erik C ; Bret > Barkelew ; Agyeman, Prince > > Subject: [edk2-staging/EdkRepo] [PATCH V2] EdkRepo: Only process the > checkout command if a valid combo is used >=20 > Signed-off-by: Ashley E Desimone > Cc: Nate DeSimone > Cc: Puja Pandya > Cc: Erik Bjorge > Cc: Bret Barkelew > Cc: Prince Agyeman > --- > edkrepo/commands/checkout_command.py | 20 +++++++++++++------- > edkrepo/commands/humble/checkout_humble.py | 10 ++++++++++ > 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 > edkrepo/commands/humble/checkout_humble.py >=20 > diff --git a/edkrepo/commands/checkout_command.py > b/edkrepo/commands/checkout_command.py > index 7d65eb8..abea6a5 100644 > --- a/edkrepo/commands/checkout_command.py > +++ b/edkrepo/commands/checkout_command.py > @@ -3,7 +3,7 @@ > ## @file > # checkout_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 # # Standard modules @@ > -14,8 +14,11 @@ import os >=20 > # Our modules > from edkrepo.commands.edkrepo_command import EdkrepoCommand, > OverrideArgument -import edkrepo.commands.arguments.checkout_args as > arguments -from edkrepo.common.common_repo_functions import > checkout > +import edkrepo.commands.arguments.checkout_args as arguments import > +edkrepo.commands.humble.checkout_humble as humble from > +edkrepo.common.common_repo_functions import checkout, > +combination_is_in_manifest from edkrepo.common.edkrepo_exception > import > +EdkrepoInvalidParametersException from edkrepo.config.config_factory > +import get_workspace_manifest >=20 >=20 > class CheckoutCommand(EdkrepoCommand): > @@ -25,17 +28,20 @@ class CheckoutCommand(EdkrepoCommand): > def get_metadata(self): > metadata =3D {} > metadata['name'] =3D 'checkout' > - metadata['help-text'] =3D arguments.COMMAND_DESCRIPTION > + metadata['help-text'] =3D arguments.COMMAND_DESCRIPTION > args =3D [] > metadata['arguments'] =3D args > args.append({'name' : 'Combination', > 'positional' : True, > 'position' : 0, > 'required': True, > - 'description' : arguments.COMBINATION_DESCRIPTION, > - 'help-text' : arguments.COMBINATION_HELP}) > + 'description' : arguments.COMBINATION_DESCRIPTION, > + 'help-text' : arguments.COMBINATION_HELP}) > args.append(OverrideArgument) > return metadata >=20 > def run_command(self, args, config): > - checkout(args.Combination, args.verbose, args.override) > + if combination_is_in_manifest(args.Combination, > get_workspace_manifest()): > + checkout(args.Combination, args.verbose, args.override) > + else: > + raise EdkrepoInvalidParametersException(humble.NO_COMBO) > diff --git a/edkrepo/commands/humble/checkout_humble.py > b/edkrepo/commands/humble/checkout_humble.py > new file mode 100644 > index 0000000..a1ff1a3 > --- /dev/null > +++ b/edkrepo/commands/humble/checkout_humble.py > @@ -0,0 +1,10 @@ > +#!/usr/bin/env python3 > +# > +## @file > +# checkout_humble.py > +# > +# Copyright (c) 2020, Intel Corporation. All rights reserved.
# > +SPDX-License-Identifier: BSD-2-Clause-Patent # > + > +NO_COMBO =3D 'A combination named: {} does not exist in the workspace > manifest' > -- > 2.16.2.windows.1