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.web11.1138.1585778937800457309 for ; Wed, 01 Apr 2020 15:08:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=nDvtXHdQ; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: t/BvH/ePDoEcEmXb8khG0QvIf2SC5d9i8GLqDr05w3A3ExQy2mBvPPx9ywIiqSvBFGVvP7UXOc nG3ZEZZ7kPdQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2020 15:08:57 -0700 IronPort-SDR: 4WtGawCoqzb0ogR3KIWf1gq3BgaOVrM4YQmNm3H5OPiOZDoGfw15m7JHWAMdLI4sToC+4VivGr 0Odwp8/oam9g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,333,1580803200"; d="scan'208";a="249609064" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga003.jf.intel.com with ESMTP; 01 Apr 2020 15:08:57 -0700 Received: from fmsmsx161.amr.corp.intel.com (10.18.125.9) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 15:08:56 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by FMSMSX161.amr.corp.intel.com (10.18.125.9) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 15:08:56 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.102) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 15:08:56 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VnvhTKu+7NxIt0vGvBubGSgY4a1Sl5uyyKH6a51AbYtwjp/LXOiS51B5sYMNTxeM5BBb2LVPbUHx1v+42y9Z17BeAw4JZw2NO5fQewpzLipeoE5BJfAayJzQgn3E90LpWn7ZB3kult5EcWjEAhV64o0K4m0SKPX8bIr51mEzNDhPo1ijQGFl+DpQzajz9JkS+XXc5SU6RdipBvc9t8L7fTTvNa8Xz4a9Ypctjz/6Q/8Y0iALGUGViG7o38TAaQlPnLevbPD2WEfiNCSLZfO14YBqxyXrg7ez/hSBVhR0/PctvZStbOrfYPuWJEYHBV4TdTOsbbU/nJiv0BywszJfZA== 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=qXW8d0Rl/U/A7nHb86d/IY5o6DRYMfPDTZd2WdH8ITk=; b=gzNwk2aEVJUxHCCZUmghDLXxquJJnjQMUMAedVXjbEnPNvUQ0Vhm9yS9/uYX6yvF+zSLa6zdCvmrXx9lou3mvwZ9kBIg82tsx3iHZZzdgRfQ5V96kn/yHTa6uJtsnCYZF1hVV5qxebJ9VbXL79Cv6NKbl1aDzE51r2SUCJHF8PXKrlM8HidWarSqSwZJrt89M0I3XImSyJCb1pCnXFcm/5WivXF8zEUxlUhGu5ILB8a+GDrIb0NfrH/6dFVUjzv/vNl1xKyZyi0ZTh2yEzI2f4PP/H/xWXDmYflKl/Xvh5+ddQGQCmlo//SyinOmvHEMllhzfKA/YiUMp7AJr/+PZQ== 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=qXW8d0Rl/U/A7nHb86d/IY5o6DRYMfPDTZd2WdH8ITk=; b=nDvtXHdQLUkjMaEGnUf3FTebZ+UehT5rjlUrWPveKVrQYiANt3A51xk2lUQ5pd/BW6psDMokXrQNnfQzjWL+ZJdFKvPykWTeQhEOB1q3sthT6C/9+e+iDL3a3PAoEhveYMzxHra7SNCCnPnLA7f2MHff7R1pgopZiSvaMPkn5MQ= Received: from DM6PR11MB3628.namprd11.prod.outlook.com (2603:10b6:5:144::25) by DM6PR11MB3355.namprd11.prod.outlook.com (2603:10b6:5:5d::21) 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:08:54 +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:08:54 +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 5/7] EdkRepo: Update Checkout Pin for archived combos Thread-Topic: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 5/7] EdkRepo: Update Checkout Pin for archived combos Thread-Index: AQHWB63L7PzeZZPqR0e9hgpYUcUEX6hk1NRA Date: Wed, 1 Apr 2020 22:08:54 +0000 Message-ID: References: <03d0594155577e47d537cb35f1a9dfe474108ab2.1585694095.git.erik.c.bjorge@intel.com> In-Reply-To: <03d0594155577e47d537cb35f1a9dfe474108ab2.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: 8537b985-c99a-456b-1dcc-08d7d68944c2 x-ms-traffictypediagnostic: DM6PR11MB3355: 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:227; 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)(366004)(376002)(39860400002)(396003)(346002)(136003)(8676002)(15650500001)(33656002)(4326008)(86362001)(478600001)(6636002)(81166006)(6506007)(316002)(7696005)(81156014)(110136005)(8936002)(54906003)(107886003)(966005)(53546011)(2906002)(66446008)(64756008)(52536014)(66556008)(76116006)(9686003)(71200400001)(55016002)(26005)(66476007)(186003)(66946007)(5660300002);DIR:OUT;SFP:1102; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: QeIztc2gFagceW4zfHrndBxVKadqyeXe3bjtcUxuGqfVGoQAmYWpDKLYn1D48YiWQP9hwSf1o/mXGt5bPNUZc6KfxfwxcOYaGDwc3vEszKxTWfMhcP24LsxfrnzaENNmIsAktU7bn736wd4Esm2z6BsC/8Mfpa/P5q1XFudUd98kCbMsuLjnq3BidxdH0mwMN2wREFS8xnIDM7RvRYzRHWOaGPXoC+tWBBNVaUYKcWxiJoM6TDo8RBS3kZTt1GbPcsBD6qGxP8kU5jKhjpPSJstqL75kvuX4kpVaWR8kbpxngn7Hg8J0X2puAugJ0MridId7MyF9fa5501W3bgBnSiw2YZnOUx/+UxXQvNLnDXSxrItss/jbJLsxiU4w+2vkEfywBR0GHfa85KJjo2PyYENZDD5R8P4KZciRLCzqWUAPihBh94kKT6tEhLXbJhZgmCYzv6SjbI+IsSEk9dmeHD8yzZJKQ7SfsL5O1VlpRVstjIbz8tj8EzAnCkX3MxbRtuxUYN2JRvS7IpSsf8l+sA== x-ms-exchange-antispam-messagedata: 3rRxGghYbOy0SfBAVHonvonW/vuLtFt+k/3Sw0zn+0Jj3od2Jj9qmkPhz/0UDqUfNNGasQoy0wi/Az8doWrHlibWsP6KLXY4v0hS1WPVr0puIuQaRSc+Xqq8yGU5McO+rWsskdZpoLNmiKXjp0CLdQ== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 8537b985-c99a-456b-1dcc-08d7d68944c2 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Apr 2020 22:08:54.7191 (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: Q68QvLlwzOob0Ft5UiwGqngvSmet0BST1e6II+ZnNvUf75yRpJ7fFut+lo5WUI4sQIM9z9cQuVnRheq0lj/Aa/sLDyUkLXugDmshmm9+6fM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3355 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 5/7] EdkRepo: Updat= e Checkout Pin for archived combos Added support for archived combos in the Checkout Pin command. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman --- edkrepo/commands/checkout_pin_command.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edkrepo/commands/checkout_pin_command.py b/edkrepo/commands/c= heckout_pin_command.py index a2afc41..858271a 100644 --- a/edkrepo/commands/checkout_pin_command.py +++ b/edkrepo/commands/checkout_pin_command.py @@ -15,7 +15,7 @@ from edkrepo.commands.edkrepo_command import EdkrepoComm= and, OverrideArgument import edkrepo.commands.arguments.checkout_pin_args = as arguments import edkrepo.commands.humble.checkout_pin_humble as humble = from edkrepo.common.common_repo_functions import sparse_checkout_enabled, = reset_sparse_checkout, sparse_checkout -from edkrepo.common.common_repo_fun= ctions import check_dirty_repos, checkout_repos +from edkrepo.common.common_repo_functions import check_dirty_repos,=20 +checkout_repos, combinations_in_manifest from edkrepo.common.humble import SPARSE_CHECKOUT, SPARSE_RESET from edk= repo.common.edkrepo_exception import EdkrepoInvalidParametersException, Edk= repoProjectMismatchException from edkrepo.config.config_factory import get= _workspace_path, get_workspace_manifest @@ -89,7 +89,7 @@ class CheckoutPin= Command(EdkrepoCommand): raise EdkrepoProjectMismatchException(humble.MANIFEST_MISMATC= H) elif not set(pin.remotes).issubset(set(manifest.remotes)): raise EdkrepoProjectMismatchException(humble.MANIFEST_MISMATC= H) - elif pin.general_config.current_combo not in [c.name for c in man= ifest.combinations]: + elif pin.general_config.current_combo not in combinations_in_mani= fest(manifest): raise EdkrepoProjectMismatchException(humble.MANIFEST_MISMATC= H) combo_name =3D pin.general_config.current_combo pin_sources =3D pin.get_repo_sources(combo_name) -- 2.21.0.windows.1