From nobody Mon Feb 9 10:50:09 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+56788+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+56788+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585694574; cv=none; d=zohomail.com; s=zohoarc; b=ATR7h5VqBKlClj/R02uLAtJTTt2XuA7Ax8LWsuSVDFyTETS+c1iBW1wp4SKUrCSA+hD7xNvgeMvi3CMIZs/c4QJjOLR0PmnTFkHADoay/qd+MfnHprLpoNUFVfZJDAw7BCQ+lrizF70Eb9o4T64LHaeVJK9yV6mTpRVJxRu+p2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585694574; 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=Jtz/AsLpWF/fxerVuuzIpUEAnti3FyAO//lgwjYryi4=; b=dH/eIvE1HzBeCuiGDOKWI3LGP05XvsIu0l3UM6Pbmsm3FCN5ifAxysrWpH7nb5nBLmkQQBcFrSYQNCJZVvKqc81LtUiXtCOb0/cRBtUWwzOjmqrJpMV/uASRBdPBpeSBRfVOoyY4W2bea9jtz5q+x4v4u0zwi1diacZYfQFQWIE= 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+56788+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 158569457430039.569738471273695; Tue, 31 Mar 2020 15:42:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hOOVYY1788612xigPaiIbXhq; Tue, 31 Mar 2020 15:42:53 -0700 X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web12.418.1585694573550368246 for ; Tue, 31 Mar 2020 15:42:53 -0700 IronPort-SDR: cqIfpMJp0usRiFrKNuxpaawfv6kJfCiSiiQnQi1y4VA310YWheaetsJ8bEVTxrRWplzdFJPHO8 ZjY31RvV6rWQ== 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:53 -0700 IronPort-SDR: dOixnZrVr0f5povOpn9l+uF/gdeOUEhRUkDFOjo13E4vKiJVRD1Cm4qLVemOl2rhv0A6y1oKPc Lyxbp3142IQQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,329,1580803200"; d="scan'208";a="284168274" 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:53 -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 2/7] EdkRepo: Added ability to display archived combinations Date: Tue, 31 Mar 2020 15:41:58 -0700 Message-Id: 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: LbZLmsm6hlWsDagaccR5qxuWx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585694573; bh=i/rY0ndfl21BFCOYSjUDPewQJdBkbloe7qF6NP9vXek=; h=Cc:Date:From:Reply-To:Subject:To; b=FrFVTyzRnDpRPbOu8MLF4/5SFNIsiwIp6zeoyLNqVwAjXnSc2GjtB0J8zUVNYZTUM9d LlQt8eTNGMEDRl6f8xXbPIsdl6UjX0GzsMGmAWmRRQah3JqOp0qOBoNv3hOP/HniORsQF t2itep0l+3xe2CfKvwCfsqNoyaSsigrXio8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Added support for using the -a / --archived flags to include archived combinations. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Ashley DeSimone --- edkrepo/commands/arguments/combo_args.py | 5 +++-- edkrepo/commands/combo_command.py | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/edkrepo/commands/arguments/combo_args.py b/edkrepo/commands/ar= guments/combo_args.py index af3ded9..dabb464 100644 --- a/edkrepo/commands/arguments/combo_args.py +++ b/edkrepo/commands/arguments/combo_args.py @@ -3,7 +3,7 @@ ## @file # combo_args.py # -# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # =20 @@ -11,4 +11,5 @@ combo command meta data. ''' =20 -COMMAND_DESCRIPTION =3D 'Displays the currently checked out combination an= d lists all available combinations.' \ No newline at end of file +COMMAND_DESCRIPTION =3D 'Displays the currently checked out combination an= d lists all available combinations.' +ARCHIVED_HELP =3D 'Include a listing of archived combinations.' diff --git a/edkrepo/commands/combo_command.py b/edkrepo/commands/combo_com= mand.py index 68d6854..9e13f47 100644 --- a/edkrepo/commands/combo_command.py +++ b/edkrepo/commands/combo_command.py @@ -3,10 +3,11 @@ ## @file # combo_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 # from colorama import Fore +from colorama import Style =20 from edkrepo.commands.edkrepo_command import EdkrepoCommand from edkrepo.commands.edkrepo_command import ColorArgument @@ -25,6 +26,11 @@ class ComboCommand(EdkrepoCommand): metadata['help-text'] =3D arguments.COMMAND_DESCRIPTION args =3D [] metadata['arguments'] =3D args + args.append({'name': 'archived', + 'short-name': 'a', + 'positional': False, + 'required': False, + 'help-text': arguments.ARCHIVED_HELP}) args.append(ColorArgument) return metadata =20 @@ -32,9 +38,18 @@ class ComboCommand(EdkrepoCommand): init_color_console(args.color) =20 manifest =3D get_workspace_manifest() - for combo in [c.name for c in manifest.combinations]: + combo_archive =3D [] + combo_list =3D [c.name for c in manifest.combinations] + if args.archived: + combo_archive =3D [c.name for c in manifest.archived_combinati= ons] + combo_list.extend(combo_archive) + if manifest.general_config.current_combo not in combo_list: + combo_list.append(manifest.general_config.current_combo) + for combo in sorted(combo_list): if combo =3D=3D manifest.general_config.current_combo: print("* {}{}{}".format(Fore.GREEN, combo, Fore.RESET)) + elif combo in combo_archive: + print(" {}{}{}{}".format(Fore.YELLOW, Style.BRIGHT, combo= , Style.RESET_ALL)) else: print(" {}".format(combo)) if args.verbose: --=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 (#56788): https://edk2.groups.io/g/devel/message/56788 Mute This Topic: https://groups.io/mt/72688776/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-