From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web12.819.1585778047989796815 for ; Wed, 01 Apr 2020 14:54:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=BHXHTvJY; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: /GpjA/vnV549jSQjOMGBEGvysUF1g0dQ9r937Ob7I0nKkxkKtZtC5qS6StFMK7S31FgDHp3tJR ujb+KJ5RVnbA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2020 14:54:07 -0700 IronPort-SDR: +UXbEYc4+urryWBzuHKOEFuJKUsnFFofyx/DnxnzqyvhIs+h0zEsKfg/nKto5ZvrMj4PEZv9F6 El1tPDkLbZaQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,333,1580803200"; d="scan'208";a="449377685" Received: from orsmsx104.amr.corp.intel.com ([10.22.225.131]) by fmsmga005.fm.intel.com with ESMTP; 01 Apr 2020 14:54:06 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX104.amr.corp.intel.com (10.22.225.131) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 14:54:05 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 1 Apr 2020 14:54:05 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 1 Apr 2020 14:54:05 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.104) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 14:54:05 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Eo9lPA9zWa3/D2YyCCejVkpCJI8AwdMuagUDB1BSCPKC//sgO/IVadfav1VQi71SsSFgneIUmUOEuymT1pT73Hr/ztDICB2zv/ICAsjpfin+egOTo1qIGZ4xeH+yKy+WkEqMexU34Tw/bpTtqrFfecTvgdkHdGMVuTJibPx9ydOlhRsLyX0KGdgQFE2DLoA6xbqE+F45ijXHsUJS9mzkuWOfCuUr1X3HQtJ+kdXVM9UpSImjuGhvLLuLg+5FWWH7XBgZWfy6FoOZ9PnKhqr34wtxq4gZ9vwVqnLinOrcvj6zoc4UVh5Zkj2+EuZ2pTeZhIMTWLiYb8FG9xtoEq6FaQ== 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=Sp5aVnw4dkcLoDrdTR72Y/xg5JFRLQ3rFr257vqv2YI=; b=XFhKWcAzvxlyDgLVpQDNeoqXC7Jq3GXBrY+Ij8FMCO5UXX8Td5lMqt/8u5cO+x5gmSzwEwguLzv4O9LciKgBRGUvnueIEwrvfJOIehsZJO7srtMe3juPBoiBpbnrNATnUZsDdXxKY4MZdrz9I/lVRKhzBawYOI8kNyCJIncS9xkmADay0bKNx/Td2LAQZ8Zia2jV2YNGhJuid256xi0rSg2iqcnZNcU52XZHUo3CctzOkQOhQ99KjiYqYpOOhl2FryjEjMN3qaczjtpS7yPe/ZQZqMBG/h0798Fs6/HtKR0fQGw9xlsmz5UbV2kSvgmG0aQOIQLIV3KnHEpw+WXpJw== 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=Sp5aVnw4dkcLoDrdTR72Y/xg5JFRLQ3rFr257vqv2YI=; b=BHXHTvJYbRaI7I+oelqau2admf8XPjj1vg6m2f+L/1MN5PMooaQff7wB23nAQBVX5WlCk2DVkMqDzT2suI3Mr4SXgPujQbBA79huJPptD8RLCwCALnfCJy80TffTLzViL3/Mn2SvQn2mGMGT+YT0EgFtMnap3AdcP7dmcevwzSk= Received: from DM6PR11MB3628.namprd11.prod.outlook.com (2603:10b6:5:144::25) by DM6PR11MB2859.namprd11.prod.outlook.com (2603:10b6:5:c9::14) 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 21:54:03 +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 21:54:03 +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 2/7] EdkRepo: Added ability to display archived combinations Thread-Topic: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 2/7] EdkRepo: Added ability to display archived combinations Thread-Index: AQHWB63G4l0/dlqVVEi54W+4/Fd2MKhk0J8Q Date: Wed, 1 Apr 2020 21:54:02 +0000 Message-ID: References: In-Reply-To: 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: 5ea47187-2079-4689-c984-08d7d687314a x-ms-traffictypediagnostic: DM6PR11MB2859: 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:8273; 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)(71200400001)(8676002)(66946007)(64756008)(66556008)(66476007)(4326008)(7696005)(66446008)(966005)(2906002)(8936002)(52536014)(107886003)(81166006)(86362001)(81156014)(26005)(186003)(53546011)(6506007)(6636002)(5660300002)(76116006)(54906003)(498600001)(55016002)(110136005)(33656002)(9686003);DIR:OUT;SFP:1102; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: x89yDdLLzEIY7DRr7+Iu0DDezpleifjn8iuTY28whbLci01QgU92eJagViXJ5BaoKEfxMa7cIdDjNa/UJKB3Q9frye75pq2Nv3mUI3QlMcJ5PLxpPDZOJOGfROenjhozrhDsE0BnIGSECH/JnPJeCqZX/1QPRuqeEsocfDnKPHP6u+swEidbex4Q0eFmk3yJYdD9C7gNz7ahNcZAYRdXKh6VqfH2tsgdlVIttolqG7X+8gdqXP1vX7dxhisSv+ENlf2sP3AJFXJpWDE5IVpO0pIrzjNixZSlr/h0XeZL9sFCji3SXzlf/9DnC+TFLvJ+a+VsMWUTt0xDiSenYHcVpm1YICLhwUmYCSwyIvycyPiGoYdvAf0FU6Sdq1QIKz1t73H0coWlbwC6AlGaGAHNGBxMv/AX/PvK/4pQ3wcoftYNNWFpAWE/HCyQJximnJwbAPGz7aEDfyz0omFxEEuqd/OlDh7Od3dlGvnFy211C3jPVsgo22GIcgPzK0WLXetY37qrs0NvxocxPuuQxMuuyA== x-ms-exchange-antispam-messagedata: IMwZCVORQwveipVW5GjvZpJtils2zxPMCoQtIt7BqWpZ80V0lOtlsIKhvz7qA+s+k60Jse+Z7krAMrT2QUGOyWiIKyLiN8IirO5aLI3JGDmFhghQUDKjuyRopFzqEiazteMpexK650RHcEVc60WpHQ== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 5ea47187-2079-4689-c984-08d7d687314a X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Apr 2020 21:54:02.8630 (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: DiI5i/n32XOw0loGwEIPCuS5UmEwBZfOpesTV9uuJBvg9ce9GoCm/VJCVzJJm/1E5A4MPV2A7qga70lTOGmrANzBz94QuUezIu6fgDqRIeY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2859 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 2/7] EdkRepo: Added= ability to display archived combinations Added support for using the -a / --archived flags to include archived comb= inations. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman --- 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/a= rguments/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=20 +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 a= nd lists all available combinations.' \ No newline at end of file +COMMAND_DESCRIPTION =3D 'Displays the currently checked out combination a= nd 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_co= mmand.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 F= ore +from colorama import Style =20 from edkrepo.commands.edkrepo_command import EdkrepoCommand from edkrepo= .commands.edkrepo_command import ColorArgument @@ -25,6 +26,11 @@ class Com= boCommand(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_combinat= ions] + 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,=20 + combo, Style.RESET_ALL)) else: print(" {}".format(combo)) if args.verbose: -- 2.21.0.windows.1