From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.1063.1588282108829128754 for ; Thu, 30 Apr 2020 14:28:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=N+khpbai; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: VcJngtnEtehRfHLkeMnPTtxFKXJVj2JKdf8AYcmqAtZPdzCu82l17xNlNowpBb2WStQHFd6hVN VH2aslpmFnBA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2020 14:28:28 -0700 IronPort-SDR: 9jy3+GbCzbiDdzOC+qc6mDp0KJojxl40AEp08WOgT2w1pw7GaFCJj4kJ04o4m6i0WHSUgb6cz4 xQSGizEPOlGg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,337,1583222400"; d="scan'208";a="303394665" Received: from orsmsx104.amr.corp.intel.com ([10.22.225.131]) by FMSMGA003.fm.intel.com with ESMTP; 30 Apr 2020 14:28:27 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by ORSMSX104.amr.corp.intel.com (10.22.225.131) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 30 Apr 2020 14:28:26 -0700 Received: from NAM04-BN3-obe.outbound.protection.outlook.com (104.47.46.59) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 30 Apr 2020 14:28:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b/5UWpFP8Wa6et5Blu/2fnt0Q4l2/wz0BjXz1dKnedcZaZ2QSxJXS+/s9w9rdao3/k/AgcNy3iqlADhIbZgJD79mLMTvLH3icYV/N2wWNTTgqLXIckvy1xHbgLZg7V2JRNqgjXHOsdb0QqSXZC0LhMBxaXtxv2xjTwKDIlae3HqmKvDJ9FY8so+BA3OHacjTdM5haIwyTElI5TNs1YnRUj027M6T/cvpL2JJPIzRKLvvFc4spoc1S6aUqJ+vM3Po6vUMtjn7KlAcmjMYx8A42EtwPoKRa6l3SwP4xanZji5TU+PfieQp7Zvv5EL6YmwMv0ET/H2kJ33yCmH1rIPFPA== 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=wdnqkZHt5Spb2RU3TtfbTnwdESVvjZZWDcWulBajrRA=; b=IpwRY+/L03A4doQ7Pb0WVtY2l/vRgF7M7uFjimsJs9+US88pHqmLcGKkKBFuzHHaJTxgP/3LhTFFVtyNFMKVoIW5VIfpSB0jsA5cGjshKw1rQ51itTY/KuKhwGnkQ3f4RoYEEGR7CUiiWu3vW5F88/CPQeGrgXQtwSpfWIWct9n5xbe+RzJxxpRG19EADDJ6l85dus/yGU4nIdF8FJB3dRQJMOacaWDnp7d56B3DhtGy2m5XlI824ICzAsOpZBUX/gt0OEg5mIECro19US2/1r+c/jFz1ETssFTk1YUf4n0aEPIzAn4o88iEeRplNNH52rtmoYiLKuSVtS3d0JnjaA== 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=wdnqkZHt5Spb2RU3TtfbTnwdESVvjZZWDcWulBajrRA=; b=N+khpbai+Yuwie4WCkulI9yCdvYyGA9bG0lrHS8UoDV0hZ8ubu2TgDLQPsChTauW6FHJpzhtoRHYfPbLtHCNg0tl8grVZl5rMNGHiY2+WbwtuE+/J7O8tfpdEENieGOBf7LPFQn4hKBXpA3oDSsbUN1i74RTuJcsc/9difUU6wU= Received: from BL0PR11MB3489.namprd11.prod.outlook.com (2603:10b6:208:75::29) by BL0PR11MB3075.namprd11.prod.outlook.com (2603:10b6:208:7a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Thu, 30 Apr 2020 21:28:25 +0000 Received: from BL0PR11MB3489.namprd11.prod.outlook.com ([fe80::d0f8:bfd7:bae2:3e42]) by BL0PR11MB3489.namprd11.prod.outlook.com ([fe80::d0f8:bfd7:bae2:3e42%7]) with mapi id 15.20.2937.026; Thu, 30 Apr 2020 21:28:25 +0000 From: "Nate DeSimone" To: "Desimone, Ashley E" , "devel@edk2.groups.io" CC: "Pandya, Puja" , "Bjorge, Erik C" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-staging/EdkRepo] [PATCH 3/7] EdkRepo: Add optional field to edkrepo_manifst to track the source manifest repo Thread-Topic: [edk2-staging/EdkRepo] [PATCH 3/7] EdkRepo: Add optional field to edkrepo_manifst to track the source manifest repo Thread-Index: AQHWHagQQPRsBmkyKkeUK/7MlwYf3aiSJiMQ Date: Thu, 30 Apr 2020 21:28:25 +0000 Message-ID: References: <20200428215710.45504-1-ashley.e.desimone@intel.com> <20200428215710.45504-4-ashley.e.desimone@intel.com> In-Reply-To: <20200428215710.45504-4-ashley.e.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZTBjNjEzYzQtNjI4My00OTgxLWE3YzgtODJhYzkwZWJhODYxIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiZGFvTFhlalNXQnc2UVVNNks0NDdQZEZodVJGQ2pvaGQ2N1hoUDVEZjBBQ2xrR2ZReEJ4SGxZZkhvd2J6VDBweiJ9 dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows x-ctpclassification: CTP_NT authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [134.134.136.198] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 137ea344-29da-4754-cc08-08d7ed4d6aad x-ms-traffictypediagnostic: BL0PR11MB3075: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; x-forefront-prvs: 0389EDA07F x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: KjWBhshiWw9egachxZyG7cJyRE7lcDSVKbfri+HAjNadcJHHD3Owk3DHhFeY7OxP5wuQ5wbKU6mxRvlMUg8oslU/tJ/4radwPef/a7+1e2RVkibLq6AzQ2ga2Oqsr/5HE5nDtjKMVXc9/9kT0BcYRN9mpPEY11RJmotd/zzCnNJd3/oa8h+uToefyzTaxEh6ewMkx6t1O8VdmVTJM8NuGFuUNDOBl2j95RjXbu9OGsAnba0uNf4obsDKIIrJhG3rMk53TxN0uzCPKn3A/SAa50XDEVgw/GYC2TkrDaoYnQME1qRZeDkH3Z3PknUMGxFyk/sgjNepuLEMC/iiRMW5NjzIF37UEHpi8asz3RBOTrDN2NIhQLodCU6/0kPj7x/nwIfg6wp5zQdF5cWFdY7tvy7MEAoQfnPWBQgOghvTpK5Ddmhaz8s5IURM2CagaITz x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR11MB3489.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(376002)(366004)(346002)(39860400002)(396003)(478600001)(86362001)(6506007)(54906003)(71200400001)(26005)(53546011)(316002)(186003)(107886003)(5660300002)(110136005)(7696005)(4326008)(8936002)(66946007)(2906002)(66476007)(55016002)(64756008)(66446008)(66556008)(52536014)(33656002)(9686003)(76116006)(8676002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: oWrNYoxKUxDNsXKzmqRRwg9FfEOjkgea6AjcOI0v/4uNVRaJ6b8E7JOpdgT4HI9Cp4thXo85x0VjVtXO1b++Z5Bll/ijDlEk+WnTwY9Ryg4ayLzV2GQ9VzqFfBUyU8o6Lanf+bqr9atbHoNWrcVunIECcI5GU+eib35JnVViFiVWmKT3iQxDOFcDAkclr8USZkOfXdyeAdsfIeQVSxXY+v38J/CzUDpGLG86kK2Mtz+1KgcBEXIxWUxar8Efe4WziOKfSIATlMbxmEupzPgu23w5Cxphsd5wO/hmvTT0cv/vTqkxYgUAZ3D9iN0vg1vUYrbWYclzzMlMbKX9A4eiGYU1l5T3yKmmMdGjVc+PK52vDWJYF1uodSM7RTsz5xMnvGraGUpWVY2s9fX1hy7RZfgoVF9/edF6yC6z10MCVkbTAzMw1ZYd3UjjilbvcSfWe2Pi9Azp5N8MzMuoh4UtzK/0K+POkhXwBkxJCgKsj8ai+6dlY6C1OQmDFp2VrFZ7WU2S2aldaworKEkdgjdRYiaViS/UiTtWp3dub9J1qaMb65CjN51eXdi6uw224dhTIt1wAkRQpdOonkQR9V1pxTlXT+yVMazVZOLe14CUvEraofMT130IFWVJiGKnjGrVUIJ6wZg6uJLB4iGWJYR/J0YBikA1rSH+Ebry1UEJ6NsPC2Waln7lAO1XOaTYVULSFhmWlvyquQ38d4KTVmYUak8ml3LO2G9AcebfY9bquqhkJ5es3LtDpqA1mLkVI6GEfBdOdAhWPpkvm//zN+KrE/LlD6p2tLiXabbiPfP8JYmFlwSNW8NXkC9+GZojFbfA MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 137ea344-29da-4754-cc08-08d7ed4d6aad X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Apr 2020 21:28:25.3174 (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: VkaoWm76VTLNkNUCaksT2MIdM3GLPa8wYls+XiTYF65qc5MuU0+wx0WETIlYZfJgTxl6PgwyLf9O54EQs+ZeQvH2vLPeIKEwIN2bvJKLcXE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3075 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Ashley, Please see comments inline. Thanks, Nate > -----Original Message----- > From: Desimone, Ashley E > Sent: Tuesday, April 28, 2020 2:57 PM > To: devel@edk2.groups.io > Cc: Desimone, Nathaniel L ; Pandya, Puja > ; Bjorge, Erik C ; Bret > Barkelew ; Agyeman, Prince > > Subject: [edk2-staging/EdkRepo] [PATCH 3/7] EdkRepo: Add optional field t= o > edkrepo_manifst to track the source manifest repo >=20 > Add the SourceManifestRepository to the edkrepo manfiest general config > for use by edkrepo to track the source manifest repository for the > workspace. >=20 > Signed-off-by: Ashley E Desimone > Cc: Nate DeSimone > Cc: Puja Pandya > Cc: Erik Bjorge > Cc: Bret Barkelew > Cc: Prince Agyeman > --- > edkrepo_manifest_parser/edk_manifest.py | 26 > ++++++++++++++++++++++++-- > 1 file changed, 24 insertions(+), 2 deletions(-) >=20 > diff --git a/edkrepo_manifest_parser/edk_manifest.py > b/edkrepo_manifest_parser/edk_manifest.py > index 080448f..dcf9c29 100644 > --- a/edkrepo_manifest_parser/edk_manifest.py > +++ b/edkrepo_manifest_parser/edk_manifest.py > @@ -21,7 +21,7 @@ import copy > # All the namedtuple data structures that consumers of this module will > need. > # > ProjectInfo =3D namedtuple('ProjectInfo', ['codename', 'description', > 'dev_leads', 'reviewers', 'org', 'short_name']) -GeneralConfig =3D > namedtuple('GeneralConfig', ['default_combo', 'current_combo', > 'pin_path']) > +GeneralConfig =3D namedtuple('GeneralConfig', ['default_combo', > +'current_combo', 'pin_path', 'source_man_repo']) The variable name "source_man_repo" is a bit confusing. My initial thought = when I saw that name was that it was something about documentation. Could y= ou please rename to "source_manifest_repo"? > RemoteRepo =3D namedtuple('RemoteRepo', ['name', 'url']) RepoHook =3D > namedtuple('RepoHook', ['source', 'dest_path', 'dest_file', 'remote_url']= ) > Combination =3D namedtuple('Combination', ['name', 'description']) @@ -40= 6,6 > +406,24 @@ class ManifestXml(BaseXmlHelper): > self._tree.write(filename) > self.__general_config.current_combo =3D combo_name >=20 > + def write_source_manifest_repo(self, manifest_repo, filename=3DNone)= : > + ''' > + Writes the name of the source manifest repository to the > + general config sections of the manifest file. > + ''' > + if filename is None: > + filename =3D self._fileref > + subroot =3D self._tree.find('GeneralConfig') > + if subroot is None: > + raise KeyError(GENERAL_CONFIG_MISSING_ERROR) > + > + element =3D subroot.find('SourceManifestRepository') > + if element is None: > + element =3D ET.SubElement(subroot, 'SourceManifestRepository= ') > + element.attrib['manifest_repo'] =3D manifest_repo > + self._tree.write(filename) > + self.__general_config.source_man_repo =3D manifest_repo > + > def generate_pin_xml(self, description, combo_name, repo_source_list= , > filename=3DNone): >=20 > pin_tree =3D ET.ElementTree(ET.Element('Pin')) @@ -605,10 +623,1= 4 @@ > class _GeneralConfig(): > self.curr_combo =3D > element.find('CurrentClonedCombo').attrib['combination'] > except: > self.curr_combo =3D None > + try: > + self.source_man_repo =3D > element.find('SourceManifestRepository').attrib['manifest_repo'] > + except: > + self.source_man_repo =3D None >=20 > @property > def tuple(self): > - return GeneralConfig(self.default_combo, self.curr_combo, > self.pin_path) > + return GeneralConfig(self.default_combo, self.curr_combo, > + self.pin_path, self.source_man_repo) >=20 > class _RemoteRepo(): > def __init__(self, element): > -- > 2.16.2.windows.1