From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web12.1048.1588282112946441984 for ; Thu, 30 Apr 2020 14:28:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=dNE5Ebw2; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: P9iRIQrxRlj5Cj3ppQEZkkYCHOaCGh7t3XP16B1UTH26rSNjxTiPnFLi5vlY2+6WhhCLcUGE4D Yf1N+4QHtdIA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2020 14:28:31 -0700 IronPort-SDR: BWy+u9sJuPlFgLtJlXKyo43/Exrn0c29zJyNycQM/ugYjQVEot6ydijcidc1VWax82v0cEMY6n RY45Hz0P4Q1g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,337,1583222400"; d="scan'208";a="283001697" Received: from orsmsx105.amr.corp.intel.com ([10.22.225.132]) by fmsmga004.fm.intel.com with ESMTP; 30 Apr 2020 14:28:31 -0700 Received: from orsmsx161.amr.corp.intel.com (10.22.240.84) by ORSMSX105.amr.corp.intel.com (10.22.225.132) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 30 Apr 2020 14:28:31 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by ORSMSX161.amr.corp.intel.com (10.22.240.84) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 30 Apr 2020 14:28:31 -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:30 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SWyGKqpcV0SqLpYqA9I9Pu5rOSwrWOF2JJ22+80Wwj7IsSa0Z1q2/4tNhF+C6eeVIeGenUbUHCF6/WD8JJGS1uLco1cmBFrY5ATRt/riknKZirUFvsq2WRO6nDKJna76Dl/fz4ry2CzWlUimRGnwugI4KhYSrTcaMMH7epBNRkQmagBz4v2yoj2j4eWmnogONNrv15frf1ANCkpxIYtKneNSwOJqlXaNR96gkKaiOxMTSNzkvUZQcFJfTybTZoiliKyexh0b14R7q2YifcThOjQNIzHWb3Z0CoXcfk42vjhujT49IvFVFDpU7ZsyukKUxnA9GScNkkcKRMN/+gxZZQ== 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=TeetZbSUp1bh0tBBqJvjt9N2tf16YMkpHicbwhTXeNo=; b=kdG75cIikltwG9X6XXGnd3MsP/15q3X3qMQvbqf3a7X4vt49KuUd9kQ0KzVfFcSWpRPdS2swjfNAmbl2MBi2emWw8MBSTYf8Byg0LFfpWpiur2en6lEswu8Veu3L22Tp171WJC+JDowO/DwzwKCX/vHjI7iDqkcuyIbFGiu7W/p04Rmhn4GH60LXK/uLRGpv38QruyOHJf0rlqzYxam+XR8V0YgtuGQO5ir3CHld4aeiUCabWRCKJFnsHswm2uMeeHjyspjtMnlJqJQFLGvWdOlDzCnB8NSv0Z/DDj6VqZeIcNjnCI1F+5SZiNi4HAzUsby6KNMGjhpeLTvIsdqhUQ== 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=TeetZbSUp1bh0tBBqJvjt9N2tf16YMkpHicbwhTXeNo=; b=dNE5Ebw2crn6GCTjjxOitrHBC1PUPUqDjYadLAUpUIMLXku33niYUefq7EWR3q49FHwYPeWVn3UadwCtlsDIHWxpyRWdwwXdwdryrInm62mRZkrTDPT+xUuXhcmWw3B1moFZ1OEhD4U4Iq5ROhWTt6B3VDdVF9O5CaTaTMgO3sI= 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:29 +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:29 +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 4/7] EdkRepo: Add list_available_manifest_repos() Thread-Topic: [edk2-staging/EdkRepo] [PATCH 4/7] EdkRepo: Add list_available_manifest_repos() Thread-Index: AQHWHagR8tA8XWL72E2eaEhCAR4N8qiSJ60Q Date: Thu, 30 Apr 2020 21:28:29 +0000 Message-ID: References: <20200428215710.45504-1-ashley.e.desimone@intel.com> <20200428215710.45504-5-ashley.e.desimone@intel.com> In-Reply-To: <20200428215710.45504-5-ashley.e.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZmZhN2I2YmEtMTYyOS00MzgxLTkzMWQtOWMxZWZhN2M1MzA4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiUFwvRUdVbCtScjBvWndndGc4Qm03WHdXVms1ZjBiU29wNW5jaVhxSnlHTFwvN0hHTGFHRVlMTUlmNDE5czY0b0szIn0= 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: e99df40e-7c62-447e-6af8-08d7ed4d6d2d x-ms-traffictypediagnostic: BL0PR11MB3075: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:9508; x-forefront-prvs: 0389EDA07F x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: eXji1FV2dMPTWcEP5vi9P9RREuYitws3K7nQ9sED15IFQvpywJlWi8XASwD//qb4YcZh5rSB9G9/7LJDhG+uzFZ5oiTLO4S4DhjecjKyivtBCOu7c+BeaZCRcD55/4wvjUS9+VUJKKDx0zll0FQCkk8ExylbVvv3a71F+H//kxEcxHySZphKPRwajZQMCsX3h605olu3BYA4oyo45TR1Is1hA1qPSsgwh0H77TVwjDgriHJ9oHzZ6M+wTQ+2unIWuWXf7PSz/QQ2Gl5yk63fphwy5OGrW8qJOcL6Tu88I9tNfxLpSj0376XmV87LcgmDrM17Gjs+86IDOly4qEnE8fsS++7UbuoBTZsUy7WbSxz47kQKhn7Fwq/THbjR+Nsm3+zDuolzlTh+E/Db/FP+D/Br4dPc9uu7mCdrP3D3AJ5fj3Cdoc5AEmgfCLRP8fZ+flOcVnBbLYxHOIoCd5Tegw7fk7UkWr2ovo1vef3wtv3Ftm8Ura+3sclmrqMR4aAS 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)(131093003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: FnnqUk5hkIf0xXgPxHR7pyZiOe4aSVDLmEIKzur11tcH81fBm8Bj4yqN/lzRkIx1HUarwjEIXRskzynIO+9UvqLuTnc2Vk/w28JdFTHXJQ8DTFjxMVZnUM+Qe/PDPxHJKYL4uW/tm9DeverATCmOsjw8XAVTE625g+RSq6qaKeJukuF2D8INeGZsl8PmYz/G8yNG6zXOM6i1GibSHQUyAIyAhoUFUbBbCIUys5HEl4Vltm9bfpfeYunnXK0L4GpGbl+vxu/0UaHREFJGvEQzmFSDWNO4Ip3VWsyUwiIIaP2Dg5swCbp2zGLdoCA3UXVDIy4WtZwzEf8ZJsTP0tlfRGnL4l3ob6Yz5f2PqqvuEQAitSa2UvUcGlYBpLR2hEbac3J2MgzZNLRJ0B7rnNdm01Wmlu1FiSINaEmgoYR2/N21pZxm+DjKFHsqqg9sQkz/vl7N7ubq73aV171Ghuw5YOecHW4C98hIkVTBX46x2ZPLGt3m9PA0zL1o1o4iBcMTQAgZYLSvZhpmOx6jvON8Aloarya4p2xOBByNvVMC4rJ3xRd1lmmy5EBHx6LvBgQP7OmuGunHlGB+QVno2sjh0g55GgqTgeCOxMFvaYemmAE2qUfMgnvQ61WQbdFWZiOQD4Y1aCiibF+0MYxNhb9pNKSrBJvYFscN143xKFHmJVAZUbwwB9xwO+m/HRSMdFqud6fGVuDEWXR4h29f6/5CH35M710cI5GPHSVxK8D+kaC5fGDTUX8V86kGZJGcOlkKXBwVki3eONiAQ3eVai5VOA3u9V6O7z5408WfvN3Ep7Kbkh2ynDxuIpYJBomjQHr8 MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: e99df40e-7c62-447e-6af8-08d7ed4d6d2d X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Apr 2020 21:28:29.4982 (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: yYJbX698ROdCWlaSdiXBg3PLJDgJghal+jNrjA1fuY87p8bCY7geh+nHuIgdqjkRCnGh5z6Ku5FZpOBYKE82KBaZK6aSJwISHNhrhUX1iF8= 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 4/7] EdkRepo: Add > list_available_manifest_repos() >=20 > Add the ability to calculate a list of available manifest repositories fr= om the > contents of the edkrepo.cfg and the edkrepo_user.cfg files. >=20 > Signed-off-by: Ashley E Desimone > Cc: Nate DeSimone > Cc: Puja Pandya > Cc: Erik Bjorge > Cc: Bret Barkelew > Cc: Prince Agyeman > --- > .../manifest_repos_maintenance.py | 53 ++++++++++++++--= ------ > 1 file changed, 34 insertions(+), 19 deletions(-) >=20 > diff --git > a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > b/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > index 24ad76a..4bded46 100644 > --- > a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > +++ > b/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > @@ -64,25 +64,10 @@ def pull_all_manifest_repos(edkrepo_cfg, > edkrepo_user_cfg, reset_hard=3DFalse): > ''' > cfg_man_repos =3D [] > user_cfg_man_repos =3D [] > - conflicts, duplicates =3D > detect_man_repo_conflicts_duplicates(edkrepo_cfg, edkrepo_user_cfg) > - if not conflicts and not duplicates: > - cfg_man_repos.extend(edkrepo_cfg.manifest_repo_list) > - user_cfg_man_repos.extend(edkrepo_user_cfg.manifest_repo_list) > - elif conflicts: > - for conflict in conflicts: > - # In the case of a conflict do not pull conflicting repo > - print(humble.CONFLICT_NO_CLONE.format(conflict)) > - cfg_man_repos.extend(edkrepo_cfg.manifest_repo_list) > - cfg_man_repos.remove(conflict) > - user_cfg_man_repos.extend(edkrepo_user_cfg.manifest_repo_lis= t) > - user_cfg_man_repos.remove(conflict) > - elif duplicates: > - for duplicate in duplicates: > - # the duplicate needs to be ignored in on of the repo lists = so it is > - # not cloned/pulled twice > - cfg_man_repos.extend(edkrepo_cfg.manifest_repo_list) > - user_cfg_man_repos.extend(edkrepo_user_cfg.manifest_repo_lis= t) > - user_cfg_man_repos.remove(conflict) > + conflicts =3D [] > + cfg_man_repos, user_cfg_man_repos, conflicts =3D > list_available_man_repos(edkrepo_cfg, edkrepo_user_cfg) > + for conflict in conflicts: > + print(humble.CONFLICT_NO_CLONE.format(conflict)) > for repo in cfg_man_repos: > pull_single_manifest_repo(edkrepo_cfg.get_manifest_repo_url(repo= ), > edkrepo_cfg.get_manifest_repo_branch(r= epo), > @@ -120,3 +105,33 @@ def > detect_man_repo_conflicts_duplicates(edkrepo_cfg, edkrepo_user_cfg): > else: > duplicates.append(repo) > return conflicts, duplicates > + > +def list_available_man_repos(edkrepo_cfg, edkrepo_user_cfg): Your commit message says that you are adding "list_available_manifest_repos= ()" but in actuality you are not. You are adding "list_available_man_repos(= )" Given that all the pre-existing EdkRepo code tends to spell out "manifes= t" please rename this function to "list_available_manifest_repos()" > + ''' > + Checks for conflicts/duplicates within all manifest repositories def= ined in > + both the edkrepo.cfg and the edkrepo_user.cfg and resturns a list of > available > + manifest_repos for each and a list of conflicting manifest repositor= y > entries. > + ''' > + cfg_man_repos =3D [] > + user_cfg_man_repos =3D [] > + conflicts, duplicates =3D > detect_man_repo_conflicts_duplicates(edkrepo_cfg, edkrepo_user_cfg) > + if not conflicts and not duplicates: > + cfg_man_repos.extend(edkrepo_cfg.manifest_repo_list) > + user_cfg_man_repos.extend(edkrepo_user_cfg.manifest_repo_list) > + elif conflicts: > + for conflict in conflicts: > + # In the case of a conflict do not pull conflicting repo > + cfg_man_repos.extend(edkrepo_cfg.manifest_repo_list) > + cfg_man_repos.remove(conflict) > + user_cfg_man_repos.extend(edkrepo_user_cfg.manifest_repo_lis= t) > + user_cfg_man_repos.remove(conflict) > + elif duplicates: > + for duplicate in duplicates: > + # the duplicate needs to be ignored in on of the repo lists = so it is > + # not cloned/pulled twice > + cfg_man_repos.extend(edkrepo_cfg.manifest_repo_list) > + user_cfg_man_repos.extend(edkrepo_user_cfg.manifest_repo_lis= t) > + user_cfg_man_repos.remove(duplicate) > + return cfg_man_repos, user_cfg_man_repos, conflicts > + > + > -- > 2.16.2.windows.1