From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.1073.1585778740655575726 for ; Wed, 01 Apr 2020 15:05:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=zd0Bo1Mf; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: sXULEl1supqEyg4jaL19KER1OHxRSmwzg+P2oEgAyCfHcee7zln5d4YRXeETdsvX+LDR656fan aQI425g4+gXA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2020 15:05:39 -0700 IronPort-SDR: 5VmbFHNhxYu1gixkXQ10Gh6BwJOpgBgAO96EQZ3mXcg+2/pMDJbg3P6tDrz6tPr4oaIZEwgjMT EJ6T1u9A49Fw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,333,1580803200"; d="scan'208";a="273326809" Received: from orsmsx106.amr.corp.intel.com ([10.22.225.133]) by fmsmga004.fm.intel.com with ESMTP; 01 Apr 2020 15:05:38 -0700 Received: from orsmsx112.amr.corp.intel.com (10.22.240.13) by ORSMSX106.amr.corp.intel.com (10.22.225.133) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 15:05:38 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by ORSMSX112.amr.corp.intel.com (10.22.240.13) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 15:05:37 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.171) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 15:05:37 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UxnBU8bA2vnRUFVcyTbLmsJqo4W1K+mkJXWg3LpNiwVpz5R9/mA8QX5t1IOA9iMTJBv9glB2eGSCpFX/OBZSARKHtErMpD+VfWdF/FOuJ7yKoP/wlExhMwaJlJmsE78yrdDtex1Mkb2jVceZjY+/FttCd2slDZLo2iNAEdXUmYkwZhPFeS1DbN2SOafzlcth6MFTNxAAnF8+F3mPsr17GvC/AE7QxjM/rhJNwGjYqAVfmFYcSlQRb/s8/dfMH23r1NbTQ42+bDJTEAEECjw8ynoI3XC8C4BOgxc/fvmAMHLcY0d/4tZWYPQoarX47aV8M6cbbcuG8TTLv1GFv5wY5Q== 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=LEaxPe+/GvLLI9Wj5VsKoURfPd+9lJxB2O2kjvPYffg=; b=V7hIHjxKGW8kCNKa/kSDzvOFINCxsMKFHMw5PEXqbk6y71rYBWLy46xVo+IeHgfDNTD8LZbWL3Oy9B9018OgQ5JAUC6DhrGe4c8VH9O/dGw9V6ltMZXBIXheJIFaMKDqmZooe9th+JoHAGNlMd7dRnNWoOS7mW9T5vplAOhzcfX4S7tP2vFSfqOcdmVddnC+FboObaTLq2EQvSj8EjUYXaj5mexVYUZCOn0PkGaYSragQlR3C3mtgA5uaJBzeY86mvtGvUhMvaEqElyM2e99P9KiILUcCLeicEyTcRe5s8KpAJQ+ywv02ejEgKNQBVSwe5OtQYQmhJIMqU1EoUpgcg== 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=LEaxPe+/GvLLI9Wj5VsKoURfPd+9lJxB2O2kjvPYffg=; b=zd0Bo1MfQmOH3Egxe/SMGnWd7/UrntD7+pUDD5t+xOYoQvor97yTBHVMz4xxdYVZNJ6/ElxdBji9YnQmNAPUklP/UInZuqIiR8WS0HmiKQU8KGJGO18fCdNia7OFhTZWHV6HkkzHOVnYpXw2jTsM+TWR7hAh/W2HFQcQnCN8hio= 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:05:35 +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:05:35 +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 4/7] EdkRepo: Update Sync for archived combos Thread-Topic: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 4/7] EdkRepo: Update Sync for archived combos Thread-Index: AQHWB63SeqAXV5BG3k2izaGEcUUoXahk0+RQ Date: Wed, 1 Apr 2020 22:05:35 +0000 Message-ID: References: <7272a3a9cb8c99bb47c02652ea621b7abe2ca26c.1585694095.git.erik.c.bjorge@intel.com> In-Reply-To: <7272a3a9cb8c99bb47c02652ea621b7abe2ca26c.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: 07590eae-9b23-4021-5dcb-08d7d688ce1e 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:466; 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: s0oJtzZ8lFwOEBYhCL3jfPK+xReNxRqMLBy55UuZT7MzNmq8ykzkOH0x1ESpwuxigb6fbHvP6g0nr1jLEdvfTRLhAf3kycDTGdyQaIHnWJAlfRI3tmx+65ZsQRuSgT8SXBO6zQYbspCbeqq4Iqeozg6BM0BDU1bgRILd7qUWM/wNTXy1p9WODQkt3hbLBw/1yt/G+VpOZE2i84H7zLxt/r9DIqqoFwOzFl1N24gmgjPSTgGaYBXW0huScOxKHSkvqoc1YbS0jQyNKVEA4aIHZCLh+0/kiF+nRIMTHJGLjUfdGK9FZA0nM2yJ3knt7bEiH46r4XI1uHpe37vwuY4LS5y4Wq9AStxlvgwzqQc3tJg/tsQ9qpg4OZZSbV8NzRWRce0YFIq5b3jiAhBYDDYjYSZc2SXdxA63tu/g4AOIeAnhwVZN0DMPzL0qcv0E8GmrgTdLE8MnZBLZssJ6JxEeCt6Y9aorQ6ysK7+pN6A8AMT9AWjd0WRPzpwrGmCxuled6UsIRc8uJW2VgKIjs5C6WA== x-ms-exchange-antispam-messagedata: d34fqtW8uGT2c7AaHfw6E1wwrnXXhb0lcnBJ10jM7InrEpq4Ak5XWPcnrRvrH26FrLsK42rmJKBIt39fL3rP2Q90EsHZBBOgp6ZHolgK0RTOD02EzjmnthY533tuOuzBLW5QNKMJmhDeMD++gmKgeQ== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 07590eae-9b23-4021-5dcb-08d7d688ce1e X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Apr 2020 22:05:35.6518 (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: aoR3c2+A+E7iyUIIGfhRpihqUlTfc/6MBpgc56IwBCh+ONYqTnt3P9P2du+BTuvIpEZPFy83ZwnRFqnjWq8pCeIOsDXJRxlXgwxOJlgxV6s= 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 4/7] EdkRepo: Updat= e Sync for archived combos Added support for archived combos in Sync command. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman --- edkrepo/commands/sync_command.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/edkrepo/commands/sync_command.py b/edkrepo/commands/sync_comm= and.py index 71c600a..daa558f 100644 --- a/edkrepo/commands/sync_command.py +++ b/edkrepo/commands/sync_command.py @@ -3,7 +3,7 @@ ## @file # sync_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 @@ -19,7 +19,7 @@ from git import Repo # Our modules from edkrepo.commands.edkrepo_command import EdkrepoCommand from edkrepo= .commands.edkrepo_command import DryRunArgument, SubmoduleSkipArgument -imp= ort edkrepo.commands.arguments.sync_args as arguments +import edkrepo.commands.arguments.sync_args as arguments from edkrepo.common.progress_handler import GitProgressHandler from edkr= epo.common.edkrepo_exception import EdkrepoUncommitedChangesException, Edkr= epoManifestNotFoundException from edkrepo.common.edkrepo_exception import = EdkrepoManifestChangedException @@ -38,7 +38,7 @@ from edkrepo.common.commo= n_repo_functions import generate_name_for_obsolete_back from edkrepo.commo= n.common_repo_functions import update_editor_config from edkrepo.common.co= mmon_repo_functions import update_repo_commit_template, get_latest_sha fro= m edkrepo.common.common_repo_functions import has_primary_repo_remote, fetc= h_from_primary_repo, in_sync_with_primary -from edkrepo.common.common_repo_= functions import update_hooks, maintain_submodules +from edkrepo.common.common_repo_functions import update_hooks,=20 +maintain_submodules, combinations_in_manifest from edkrepo.common.common_repo_functions import write_included_config, r= emove_included_config from edkrepo.common.ui_functions import init_color_c= onsole from edkrepo.config.config_factory import get_workspace_path, get_w= orkspace_manifest, get_edkrepo_global_data_directory @@ -53,22 +53,22 @@ cl= ass SyncCommand(EdkrepoCommand): def get_metadata(self): metadata =3D {} metadata['name'] =3D 'sync' - metadata['help-text'] =3D arguments.COMMAND_DESCRIPTION + metadata['help-text'] =3D arguments.COMMAND_DESCRIPTION args =3D [] metadata['arguments'] =3D args args.append({'name' : 'fetch', 'positional' : False, 'required' : False, - 'help-text': arguments.FETCH_HELP}) + 'help-text': arguments.FETCH_HELP}) args.append({'name' : 'update-local-manifest', 'short-name': 'u', 'required' : False, - 'help-text' : arguments.UPDATE_LOCAL_MANIFEST_HELP}) + 'help-text' :=20 + arguments.UPDATE_LOCAL_MANIFEST_HELP}) args.append({'name' : 'override', 'short-name': 'o', 'positional' : False, 'required' : False, - 'help-text' : arguments.OVERRIDE_HELP}) + 'help-text' : arguments.OVERRIDE_HELP}) args.append(SubmoduleSkipArgument) return metadata =20 @@ -222,7 +222,7 @@ class SyncCommand(EdkrepoCommand): if initial_manifest_remotes[remote_name] !=3D new_manifes= t_remotes[remote_name]: raise EdkrepoManifestChangedException(SYNC_URL_CHANGE= .format(remote_name)) #check to see if the currently checked out combo exists in the ne= w manifest. - new_combos =3D [c.name for c in new_manifest_to_check.combination= s] + new_combos =3D combinations_in_manifest(new_manifest_to_check) if current_combo not in new_combos: raise EdkrepoManifestChangedException(SYNC_COMBO_CHANGE.forma= t(current_combo, = initial_manifest.project_info.codename)) -- 2.21.0.windows.1