From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.34249.1589764812573793089 for ; Sun, 17 May 2020 18:20:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=UHwJtlaF; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: n4WkqHwOC+kRyC90eoMjM6nCgmNYuAmAfcs5i3dGBqUPxhR4p4SqNB1nhwBoEYiQYV0kK3i3NR nSopavzu8xNw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2020 18:20:11 -0700 IronPort-SDR: m1QJ2NBns6rSTjIc9Q9QdOaTZ2ed8gn90CAv+Fg9JAX6k6AWu/0QlaUoEliQMwiYQ2bt3t8oAI P98H47lEKClw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,405,1583222400"; d="scan'208";a="307960898" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by FMSMGA003.fm.intel.com with ESMTP; 17 May 2020 18:20:11 -0700 Received: from fmsmsx124.amr.corp.intel.com (10.18.125.39) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 17 May 2020 18:20:11 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by fmsmsx124.amr.corp.intel.com (10.18.125.39) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 17 May 2020 18:20:11 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.106) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 17 May 2020 18:20:11 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VSgXISuj/ssTxai/U/JTJKzGV6si1j7D2sgwbwaOWxIrukeQE0j6VeEdqHXVpsi/pt8L59vXc4+c3EGNlSkE52VNmtqbnG6zGN6Ga6QG9mwEIAPSGw65Z9BYgTEa/dk31M8eYO9RnFAKj026exvYqmvgU6gbIoe+RWcdBMfeAVpAkBMtAu2PsoCRX5UuFFQhELneGvtY7tw7MNRK34cvoRgPL91lOjCktrVWVU9GZGdoKga2U0H4iBJWBM3+sEee0248cQLdDZBH8sg7NL7i320Zq/8yxk7lsKoHJ8/gcJx09MiAmQr4xTP5N0nZU7OodBeevtg8WnOdB2YSuDsy1Q== 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=Uk5/GxXGUrRPd5oSBcCqoJPPBIjCxdakZOSzcUU8zfg=; b=N6obLHTUKDE6SfZ2lN6Nq07uRuaOH8EgbhHmadW4jlmQvx6oOqmnVGrfZiR0TUKjXCxdEe3/PUPyYkmeEQZFQrroiLkhm8l13citDw29Bky+q8N3ZNUS6EhxSLpHtEYVQPmaqmMGJJFeN/OP/+0H5BeogHSAYsR+h4KStGQtwAzof8qD6/ODRJK9TsV7ICi/0xpB2I/218do7Ty66kRuvHGkqvDCzmVaVkMzdQvgX1XgqtpFMDVTKZBJPcufBhrt06GvGsBkWpVXeesgBBySJ62k+3RXcDVFXr2LRPTnobapoe2ZfbeVCmXnMXyMjxC5996T1Vlzinm0xDfHHPHcrg== 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=Uk5/GxXGUrRPd5oSBcCqoJPPBIjCxdakZOSzcUU8zfg=; b=UHwJtlaFYizgCju++QC17Ym7vW1D6eluJSJ+ONl9qRifcvNa3lbaQcnwd0ESWniWxCt57Fgq5SgS5q11UuNyfsgmcO2pW2dLYGg8ENBkdqNKdY+Mi5Ai9oNd7mvuS8d0wPdjqBj017OlnS7wKFsWQWpm00kTJ2VyI7QExz08a0I= 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:20:09 +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:20:09 +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: AQHWKlAIEYmQu8eRp06p2qz5yrxYDqitEEsg Date: Mon, 18 May 2020 01:20:09 +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: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMzQzNWJmOGUtOTA3ZC00MjA0LWIxZTYtOGFkZDhmNWZmNjY4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiQTRjZW1KalpvZldEbGpmdHk2NFA2andCbm5IVUVTSVlhSWcxbHA0SWk4VVNFbUhjb0h4NzFmTHdFVFRqeUtkZiJ9 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: ac9c2fcf-cae6-446e-e1de-08d7fac99b68 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: +Bt9bpyNWUOBDNRgavLLszOlAIkJHdcipDdchuqYxpE8JYU1ypHjqDIU9A4UNZIPYIHcTPEb0JJgH12MT7cevn5HyxfFpDVMGnM3CVMdPnWKcssJzkFpDjF/efBINlv2VS8xdf7F5LwxT3vKVyD+fBNFdcNBxv2dhir9R5FZ0kijaKhlxEzVSD983j29uFMNaZySgfPIJ9Tk1wzDR8w5jdM648n/nf9XamZn8GaMYLrdmu7bgN2g1LpCq21CUr+Wp0FYEPcVLtuiDw5sKuXLHESgKO6H16ePJh5WHyxF4Di/pcEXkBTEiPLzxJyAcYfTU5ozwivtRrsl9Wg9hMvX4MTt75HmWVNlTUiMYrs5yFb7ScUqgOIRka3jR70rd3mXhvVP4PeIq0ivTDZSOvvxOw+uCVfCjTRElno8IPMBQ07b3DEUxLnKaJZCyy3jSQv74wNVdnZTIaaZIy+IOJb6xVqZddjQyOJ5rR07uMRyCLFAU0P0gX4dmv44r1c7eFDT 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: KnS1d8M/LZwx7KFCpM8g/94TmSMcs3990ODpXJ7k+LkpDVtSA8/iGQVEgdKxQMrNJEi1wknxnAzrBcgN9HoV7glBP/Z3XzcnSvB+LRmBGhOxyZM8juAi49RgUKGAhaeFmAuD8IpnvYzKtNWOKtqxCjpN3Z8u52WsJVy0vqnDcmAOARqoCSiOgoKEP33ZLXljANrkr9pqjOyg9op7AMrsXm/UHBNevPu1PbAqMsLeKTq16yg3yBucFiqLbg08Pk51epMFITxtmuBhRpN3QX5NUMbd/CVQ7/m+P8Zk+g2igPQV2t2j7k/EZex38vvDRc1jF5ke1gkNK/+8i2Wj5NMlAnZ200UPDWOmUeX64orF904jv+yq1rt7TC701ThUTxlm+3DAbKmXZX4/ct5mEySHnnBb8vEFxXLhWUMsEas2+YKLs3eder9dqFclVXSA0AyxqTr/l15ego6tFtwpqY2lMY19HNynmF70utIYxTJnBFQ= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: ac9c2fcf-cae6-446e-e1de-08d7fac99b68 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 May 2020 01:20:09.7867 (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: AoBVlEbbQeQniMRvBjTd+Ubn84QKL3UvqgmzP85r+ZriJ+Ww1AhpQ1rdUbPV+Qhk0BRF28tud2Ip6zJJq16xwHIqktmi8m2rdkrT/7Fh8xQ= 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 Reviewed-by: Nate DeSimone > -----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