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.web12.246.1585777197591789289 for ; Wed, 01 Apr 2020 14:39:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=uULafbiz; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: r1IArRn5ttVBHslQS9P7JSiHyulJeXeTKFTETg5dgiBfsBddhjaMyRL4gIHmYvff3zQyYS5rme IyQyNasDgVMw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2020 14:39:57 -0700 IronPort-SDR: sP+aFJkkhV6F3hKc1ljF2Mq9J1KGuDJTBXQmbOLtT2AdvgXtWrl8ebJC9oMDBAsmeIya8HvUVI aMl7JxOVw6rw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,333,1580803200"; d="scan'208";a="252781233" Received: from orsmsx103.amr.corp.intel.com ([10.22.225.130]) by orsmga006.jf.intel.com with ESMTP; 01 Apr 2020 14:39:56 -0700 Received: from orsmsx154.amr.corp.intel.com (10.22.226.12) by ORSMSX103.amr.corp.intel.com (10.22.225.130) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 14:39:56 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by ORSMSX154.amr.corp.intel.com (10.22.226.12) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 14:39:56 -0700 Received: from NAM04-SN1-obe.outbound.protection.outlook.com (104.47.44.56) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 14:39:56 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jBx6ESAs1Em6WUb2Yj3gq+POVVj1hVn12jNTj/xa+wSXtYtA99luJkqAvEmZgrkcT8NzNxMQ6YIoc6tIsqE48iP2HE3hIAEPCM50vnVvRizoIER2hqb9kklHUTXGrd42LAyshR6ahOqsR4NbgLPCNHwNQvDjOMTDKsOErtAGHoSkUfexuR3js0jK2rJqYSa5OPaeBXOrpMPcaNe+E7tCm6bLj0WSLrJzu+iR7nR6XMLys16T2rX3yGjzzoo5neiGFfVCD6lYV47jBxpD+mDJukXlRfnkLmYnOZnzPh3j/sTfpK7fL13mYfleH/aYEDe1hEiEEAaynoP3fVi2hwrYbQ== 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=cV2e9i2ssC87Qr6f5yQ6SOB/fq08N1I/dlCBGWsP4B0=; b=H3OyO7P6Dj227eUH71yS6CiHX82Eq+Q49DkTucB2VHOW6g3hwfqtJ2m/o6j+BS2V3k1450DqWrId0NBuTo1jepHBaJtZZFt17W7U9O+Z9MfRA7K8uZLvDPJVO7T88VtffV5YAvQyJ7az6joEbeWYPAgxsImr7kPEtgc3uwDevfP7/Fg1G5edJL8RmEVgdaG26WDr2C2blLQ5QoVlLmML3MQsHrdfI5lQs6GnNKk1bYsBjnz3Y1DhTVErv8dZ6S/8dmPB3CW0O5rQ1dxLb6E2upDE6Wcw2NiS+gsDjemInvLR5nS4RvqyL/4d34qtbdBgLmHgt4Z6dKUnzL3y4Z7Rig== 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=cV2e9i2ssC87Qr6f5yQ6SOB/fq08N1I/dlCBGWsP4B0=; b=uULafbizRb6HDXUxSnKwzRyxS/wOd50EPBxgEYIz/EENYDR6ZU1Z9oIbPDFeCcikVDEUmldhiEt1ai+r9tCtpFqvMUNz4i98kftFFpwmlEzdgyfnS8ClHaRWZfovTPr2oKQdOygl0DulqOXOBNQOqPmMjt8Tn+S+91bsuxA/WcA= Received: from DM6PR11MB3628.namprd11.prod.outlook.com (2603:10b6:5:144::25) by DM6PR11MB3996.namprd11.prod.outlook.com (2603:10b6:5:196::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2878.15; Wed, 1 Apr 2020 21:39: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 21:39: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 1/7] EdkRepo: Adding support for archiving combos Thread-Topic: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 1/7] EdkRepo: Adding support for archiving combos Thread-Index: AQHWB63B68kRQdy3P0SdBeHs/FiaVKhkzKdQ Date: Wed, 1 Apr 2020 21:39:54 +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: 6b781db3-a752-46d9-d5c6-08d7d6853752 x-ms-traffictypediagnostic: DM6PR11MB3996: 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:5516; 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)(346002)(376002)(396003)(366004)(136003)(39860400002)(4326008)(81166006)(66476007)(81156014)(76116006)(86362001)(71200400001)(2906002)(64756008)(33656002)(26005)(8676002)(8936002)(66946007)(66446008)(66556008)(478600001)(110136005)(54906003)(5660300002)(52536014)(53546011)(6506007)(316002)(966005)(7696005)(107886003)(6636002)(9686003)(186003)(55016002);DIR:OUT;SFP:1102; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: tStJ4706PvlxV4+kod0aDLnOyhj16Hz57jy/I0v6udgHfgJRmaGgDDwTtsjsoQS9wOaP4QGXsrg0iJ4UT7saYvduCJWMGL5PTuQGInrJC3ioE/WUL2GdQH/kRB9FmL1RwNaaUEPramm6yjaQcmZ6li5z08FFHHG0QAKYp9RQ/UCTlj8z7l2VmRkuRFL97nTivlNtEDmNUEco4iHrgPTOgdgS0PcPsrB4k8EVi+rZWHvHEYhcj3JiWlOdKuPCfp+w6RtaaPgJB9CpkoXDxWNGjgGm9Ep6tinj8zWUmgTxQwiYA8FhJPoLKGyexkIgOxNbL8rtvx49czJ6qAbVMBySZW7YsKgBXHM8pRH/SWk8nIxOo4g9gjNDjFnFxhBK7FYDqajf9xPrZNM6sBnxa3NicJqiQa9Gyo7CWhgoSotRO9t9EmlwwtuMjGDNOqo8j10Bgk6J1aZx3+zksreqJF9EGsFuEf7HdQE8aEv9DaIXvPYCpZlgd2A9l3AnjVePDc0+AOxtc3L6X3IVbYtCVOLIIg== x-ms-exchange-antispam-messagedata: YRPQLMY0uW7OrWTXCqsv0F0wQ28GBCpZb+QN9WOEsfbVYrm8ub4QZknPVRq0oY8uoM1Z6mQQuxdhCGuhOF5KfNYfWwbSPTNwjpdcyAVRE770E/65BPutPeKQpaur74C1ZZWfggThB+xDvIjWru99+g== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 6b781db3-a752-46d9-d5c6-08d7d6853752 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Apr 2020 21:39:54.1645 (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: 4rD1JokvjuksREasKx6Xz3HwTUA9KW3aaUMIzYGEBjkNFK4xzb+gbAstzJRhBVDN0Im/tIVHPqKmyXLYLmF4aM8fTCRcnR6Xh1GW29KQzTI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3996 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 1/7] EdkRepo: Addin= g support for archiving combos Adding support to check the archived attribute on branch combos. This all= ows a combo to be archived and available if required but not dirty up the c= ombo list. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman --- edkrepo_manifest_parser/edk_manifest.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/edkrepo_manifest_parser/edk_manifest.py b/edkrepo_manifest_pa= rser/edk_manifest.py index dd3512b..7b513dc 100644 --- a/edkrepo_manifest_parser/edk_manifest.py +++ b/edkrepo_manifest_parser/edk_manifest.py @@ -306,7 +306,11 @@ class ManifestXml(BaseXmlHelper): =20 @property def combinations(self): - return self._tuple_list(self.__combinations.values()) + return self._tuple_list([x for x in=20 + self.__combinations.values() if not x.archived]) + + @property + def archived_combinations(self): + return self._tuple_list([x for x in=20 + self.__combinations.values() if x.archived]) =20 def get_repo_sources(self, combo_name): if combo_name in self.__combo_sources: @@ -645,6 +649,10 @@ class _Combination(): self.description =3D element.attrib['description'] except: self.description =3D None #description is optional attribut= e + try: + self.archived =3D (element.attrib['archived'].lower() =3D=3D = 'true') + except: + self.archived =3D False =20 @property def tuple(self): -- 2.21.0.windows.1