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.web10.418.1585694565871970875 for ; Tue, 31 Mar 2020 15:42:46 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: erik.c.bjorge@intel.com) IronPort-SDR: IFTH8psdyHyz3Tm6L3KzVK2MWlz6LqpAWVLln/ObgnF8XOZysVoK/lAeEHfJZDXZl1f4B5IN+6 l8MZ9wLoTLlg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2020 15:42:45 -0700 IronPort-SDR: 4p/bsRjL3rI5bycqOGblZPjixVDgbvBfqWZQqSM07lZfZsKZA+NTjBq75Z6CVKvDMUOBMzZP8l oKosZjjUrb6A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,329,1580803200"; d="scan'208";a="284168254" Received: from ecbjorge-mobl1.amr.corp.intel.com ([10.134.71.242]) by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2020 15:42:44 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-staging/EdkRepo] [PATCH v1 1/7] EdkRepo: Adding support for archiving combos Date: Tue, 31 Mar 2020 15:41:57 -0700 Message-Id: X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Adding support to check the archived attribute on branch combos. This allows a combo to be archived and available if required but not dirty up the combo 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_parser/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): @property def combinations(self): - return self._tuple_list(self.__combinations.values()) + return self._tuple_list([x for x in self.__combinations.values() if not x.archived]) + + @property + def archived_combinations(self): + return self._tuple_list([x for x in self.__combinations.values() if x.archived]) def get_repo_sources(self, combo_name): if combo_name in self.__combo_sources: @@ -645,6 +649,10 @@ class _Combination(): self.description = element.attrib['description'] except: self.description = None #description is optional attribute + try: + self.archived = (element.attrib['archived'].lower() == 'true') + except: + self.archived = False @property def tuple(self): -- 2.21.0.windows.1