From nobody Mon Apr 29 18:19:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59469+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59469+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1589409210; cv=none; d=zohomail.com; s=zohoarc; b=eMO29LZiQZMF4ddSjpBRxipOxy061zYE+V21J2xu7VMKV0ysaQyh6jEcTDBACOxPWRBOzHYNoqZbwra81ug2U3fQ8jrltAhj7rnems1G6vwv/U9tnYXwTOu6Ea9TA2Qfle6oimJllcpZtFs9MIA8vSEbsx0RrTsqirqRGlG/zUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589409210; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=iDyEIT1bhevrC+dMBUiOs9bvKoo5B98pN/Y8Jx9ftXw=; b=J/npPyu9In/2ZKiS5/i/7AVwiyYWIlSaKAJxLFXvXZ1uMX7tuRBrfwX2eXnQcLDDEB4jKjRDWyG8oQKrj7O5NCD9uW3MNZdjlv6s3PH3VZalHVP+jLJ6PHwKgC9XYr1YKJwukv67yfa3d7w9BL1VGxRwjA+R+O4KBd5NtQvYnjY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59469+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589409210852988.8445875163015; Wed, 13 May 2020 15:33:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id AOPgYY1788612xfKAx2VAYwn; Wed, 13 May 2020 15:33:30 -0700 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.1602.1589409209994526341 for ; Wed, 13 May 2020 15:33:30 -0700 IronPort-SDR: 1HMHbX0WfLUt/v/39syWl44T9jzTE4Xx9Zmb+lKPsy39UhHq57jkxd0+Qzde4ohRRBnnltit9a 2YhFZ5Oztm6g== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2020 15:33:29 -0700 IronPort-SDR: H+HcK7Th87ghz0/5wXp1ThdfEd7rmvVWdZ5sXFWkkuulcivzuoYY+lf7AfXwW2mp13t+tAGkqh +KBivb7OW7Gw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,389,1583222400"; d="scan'208";a="280654590" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.212.87.126]) by orsmga002.jf.intel.com with ESMTP; 13 May 2020 15:33:27 -0700 From: "Ashley E Desimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Only process the checkout command if a valid combo is used Date: Wed, 13 May 2020 15:33:20 -0700 Message-Id: <20200513223320.19904-1-ashley.e.desimone@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashley.e.desimone@intel.com X-Gm-Message-State: RK4gqPeJJ4P70ZUvzx2JYdkPx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589409210; bh=jzrXXCWhhEip8yv7pHPckuno711zvP2dFIZujV7H0GI=; h=Cc:Date:From:Reply-To:Subject:To; b=hN1ePAM6VotHoNQDPJCChzkIt+n8UvIXirD0PGnAyB9whJcj/3H3gdujCRP2brxB2T9 5vTRqnvGijqz9+Z5jWFoiqEre7pDlMp7Y7MRUY6r3aB0kGQ0ErCftkmwbZ0TwDa30efCM 9JpSFj5+vSC0dI0JgVg1NEDyzKEootfT+iE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 | 18 ++++++++++++------ edkrepo/commands/humble/checkout_humble.py | 17 +++++++++++++++++ 2 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 edkrepo/commands/humble/checkout_humble.py diff --git a/edkrepo/commands/checkout_command.py b/edkrepo/commands/checko= ut_command.py index 7d65eb8..bc8a080 100644 --- a/edkrepo/commands/checkout_command.py +++ b/edkrepo/commands/checkout_command.py @@ -14,8 +14,11 @@ import os =20 # Our modules from edkrepo.commands.edkrepo_command import EdkrepoCommand, OverrideArgum= ent -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.command.humble.checkout_humble as humble +from edkrepo.common.common_repo_functions import checkout, combination_is_= in_manifest +from edkrepo.common.edkrepo_exception import EdkrepoInvalidParametersExcep= tion +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_mani= fest()): + 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..ec0ffc1 --- /dev/null +++ b/edkrepo/commands/humble/checkout_humble.py @@ -0,0 +1,17 @@ +#!/usr/bin/env python3 +# +## @file +# checkout_humble.py +# +# Copyright (c) 2020, Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +# + +CHP_EXIT =3D 'Exiting without checkout out PIN data.' +NOT_FOUND =3D 'The selected PIN file was not found.' +MANIFEST_MISMATCH =3D ('The selected PIN file does not refer to the same p= roject ' + 'as the local manifest file. {}'.format(CHP_EXIT)) +COMMIT_NOT_FOUND =3D 'The commit referenced by the PIN file does not exist= . {}'.format(CHP_EXIT) +PIN_COMBO =3D 'Pin: {}' +COMBO_NOT_FOUND =3D ('Warning: The combo listed in PIN file: {} is no long= er ' + 'listed in the project manifest file.') --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#59469): https://edk2.groups.io/g/devel/message/59469 Mute This Topic: https://groups.io/mt/74193675/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-