From nobody Mon Feb 9 03:46:57 2026 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+56790+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+56790+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585694580; cv=none; d=zohomail.com; s=zohoarc; b=S7PUPXShXWP9PPqfVoPJVHHcy+k0byrvl36o1Ks8hWI3P6hVC6d/YIa5dxTJs0tkbjehtrdKN55aACx8Kbo4AKS+DmDyIIOiE/IVBdxT1VYyFzmJ9mMHEsiOE8itUSoNeYDZyckfuvHf+7UylpsOUM4Ndfu5jUHm/8B4ue0ltZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585694580; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=KiLjMHi0S6xPuG9HCQlg58iXPL3bzcjzKozTohQ+jsU=; b=VW/BG7XRh1wRuillFwIvLFEGjVUjms4HVauUUFX2HQbPYX+rfEzwci/vLBgNkc+jTsnR1EajeeTYzsHoEU7Ne+OFlhwghh5cVVwQPjg1bluWMt29gXUUg6awEo30r2lebGWvx+pKl2qsOe8uW8LL4Tg7cBQm1qb5H3K3DP+1i28= 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+56790+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 1585694580371306.53361611189086; Tue, 31 Mar 2020 15:43:00 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2BoPYY1788612xxqLnL2n5U4; Tue, 31 Mar 2020 15:43:00 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.418.1585694573550368246 for ; Tue, 31 Mar 2020 15:42:59 -0700 IronPort-SDR: QHPMGEVssq5OEhJDeY9YnyfG2+6Nuz4cVEfJWtrTXmdCtIC7iYeSYZTf0QsA+pgkQpBFVG9CAK X56YkCYzl4uQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2020 15:42:59 -0700 IronPort-SDR: O4BCqe5Gxbm6MMs4veyPM/DXrFeiy64wX/zzapeKoji/MA2Vy8S382T81IagTfLEJXVXJ7jPCi zR4+hQGB6jOg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,329,1580803200"; d="scan'208";a="284168296" X-Received: from ecbjorge-mobl1.amr.corp.intel.com ([10.134.71.242]) by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2020 15:42:59 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 4/7] EdkRepo: Update Sync for archived combos Date: Tue, 31 Mar 2020 15:42:00 -0700 Message-Id: <7272a3a9cb8c99bb47c02652ea621b7abe2ca26c.1585694095.git.erik.c.bjorge@intel.com> In-Reply-To: References: MIME-Version: 1.0 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,erik.c.bjorge@intel.com X-Gm-Message-State: M5qtzlKTVR88luWZ9J5WdRvCx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585694580; bh=BotLKs/BgI0+Qx3SMf/4uvZTdziqnXLmlsE2h+L5WmI=; h=Cc:Date:From:Reply-To:Subject:To; b=mN9jnR3/lFcCUsJ4fEKWIAt0fzvDd1bss6WtWOcMs0fID4/tY1C7EZwl7HfMubV+uNs vUerD3wWm9B6d4y+lcPcejPN38fYC22N0QXlBEyW9lC2PetGlArCYUBUukPF6wkCRK/xC CHd7OINN8J1ZVcwuZCUluWyTcVlbruTKMoU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Ashley DeSimone --- 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_comma= nd.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, SubmoduleSkip= Argument -import edkrepo.commands.arguments.sync_args as arguments +import edkrepo.commands.arguments.sync_args as arguments from edkrepo.common.progress_handler import GitProgressHandler from edkrepo.common.edkrepo_exception import EdkrepoUncommitedChangesExcep= tion, EdkrepoManifestNotFoundException from edkrepo.common.edkrepo_exception import EdkrepoManifestChangedExcepti= on @@ -38,7 +38,7 @@ from edkrepo.common.common_repo_functions import generate= _name_for_obsolete_back from edkrepo.common.common_repo_functions import update_editor_config from edkrepo.common.common_repo_functions import update_repo_commit_templa= te, get_latest_sha from edkrepo.common.common_repo_functions import has_primary_repo_remote, = fetch_from_primary_repo, in_sync_with_primary -from edkrepo.common.common_repo_functions import update_hooks, maintain_su= bmodules +from edkrepo.common.common_repo_functions import update_hooks, maintain_su= bmodules, combinations_in_manifest from edkrepo.common.common_repo_functions import write_included_config, re= move_included_config from edkrepo.common.ui_functions import init_color_console from edkrepo.config.config_factory import get_workspace_path, get_workspac= e_manifest, get_edkrepo_global_data_directory @@ -53,22 +53,22 @@ class 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' : 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_manifest= _remotes[remote_name]: raise EdkrepoManifestChangedException(SYNC_URL_CHANGE.= format(remote_name)) #check to see if the currently checked out combo exists in the new= manifest. - new_combos =3D [c.name for c in new_manifest_to_check.combinations] + new_combos =3D combinations_in_manifest(new_manifest_to_check) if current_combo not in new_combos: raise EdkrepoManifestChangedException(SYNC_COMBO_CHANGE.format= (current_combo, = initial_manifest.project_info.codename)) --=20 2.21.0.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 (#56790): https://edk2.groups.io/g/devel/message/56790 Mute This Topic: https://groups.io/mt/72688781/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-