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.web10.992.1588282101664166237 for ; Thu, 30 Apr 2020 14:28:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=cZEjSYqm; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: eyy4Fmteaq8eJs599/6RSBsZlSxSwSJS1JxtwU2quT0g77bEV+95W3C340YXcMT2KpQyHrhcZ2 FbIwp1XdT7gA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2020 14:28:20 -0700 IronPort-SDR: +zM35z1NghXaYCtLKHbHct2cr7viGuMLn2bEdt5xn/WZmw10tuZ5LNnqZnslBaDayrIbZRgcV2 mdJaab9EqAVw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,337,1583222400"; d="scan'208";a="368281761" Received: from orsmsx110.amr.corp.intel.com ([10.22.240.8]) by fmsmga001.fm.intel.com with ESMTP; 30 Apr 2020 14:28:20 -0700 Received: from orsmsx160.amr.corp.intel.com (10.22.226.43) by ORSMSX110.amr.corp.intel.com (10.22.240.8) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 30 Apr 2020 14:28:19 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by ORSMSX160.amr.corp.intel.com (10.22.226.43) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 30 Apr 2020 14:28:19 -0700 Received: from NAM04-BN3-obe.outbound.protection.outlook.com (104.47.46.54) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 30 Apr 2020 14:28:19 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=idblKb+LEUjA94MKcqW3UxUEDJSOBp7imwPNABJ8emjBg5f6XreEY/LmheGNELDVV/CcU/tQvLfap+rLcIhsO11iE52MZVBC0ny9EoN2corYgnAiWCowiXMw1epwsr1HBJzMN+m529rFavHrC3OuO4el/4KMTIyemDcREgluQy90fry8eCKNoG77FW4dzfjHIWgBrV41CVx+dFoJvfhHqdpwoNw/8PitBkynAohqsEll/TZ+pOhxwn5lKKQjrqEsXilNi2edYBxIr8LhWkgDPxcNhlktdoUjEJ1FgTfAXdhh1MhQMHwkmoSI8GCI/G3JsPEn28OCFcwAnPvwdw7gfQ== 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=fZmhfWEX1L8Pz8x+DuHYJt3RRKbnEI0Vjs99T7Fb+WI=; b=HPJBJohP857mX7r0XC3rhf+DVVB6TEsuyC6IDCgmaelucsy6nymCa0E+TFHKn7xbFkg57jMAtIRQLiBn670O/7yZ11KkHI+s+TvSbGipyQasdKJhQBZ4kxQJ8drOR6vlnpvud4zjOan/G7OiP+nHB4ZOBJo7NHPeNFozDqruYqeZl7XT9alsHPsZbCSHU6OmiduuM2sdx5CKZzuEQaAzKdZRrI2PpIeHjJJyMMIKC4uJehxQwElxbqYyUSM/T2wiifrr2QFpzK0XtFqUx+jN2rF7hKKj8KIGcirnyWbARfRAPL8Tf0Yr8ebd5G5phA1dbFI8NIaOadhPVysb5RFByQ== 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=fZmhfWEX1L8Pz8x+DuHYJt3RRKbnEI0Vjs99T7Fb+WI=; b=cZEjSYqmuc4/twzih1xbYrxX9xlnfLuH8lpQsup8EN3frVUQ0XFiiqkqZs3a5boOvWb8hPJkAKhtKvQcXchm4ZKXrB3ZiBap+Qa+vOR1WEPi72o6Y5Q6PpCRV1qZDhmm5V6NzvxZwxRo9s26Qu0uggXBuSIZnmACo3I0lGwSo3I= 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:18 +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:18 +0000 From: "Nate DeSimone" To: "devel@edk2.groups.io" , "Desimone, Ashley E" CC: "Pandya, Puja" , "Bjorge, Erik C" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH 1/7] EdkRepo: Add check for conflicting/duplicated manifest repo definitions Thread-Topic: [edk2-devel] [edk2-staging/EdkRepo] [PATCH 1/7] EdkRepo: Add check for conflicting/duplicated manifest repo definitions Thread-Index: AQHWHagSYdWsMh+BmUS4f/NhD7CJI6iSKWqQ Date: Thu, 30 Apr 2020 21:28:18 +0000 Message-ID: References: <20200428215710.45504-1-ashley.e.desimone@intel.com> <20200428215710.45504-2-ashley.e.desimone@intel.com> In-Reply-To: <20200428215710.45504-2-ashley.e.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNTQ4NzUwYzQtYWExOC00M2IwLThjNDItZTFlMjQ5YWFhNmYwIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiNnpXRVhSR3ZoXC9aSENRVDU4dXA3NXF6R1BVdHFJaFhTaUxBNVhLaUdUUFVSazh6eU5OVkJKNVFkMjBobloxQzMifQ== dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows x-ctpclassification: CTP_NT authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; 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: 4e9687ff-6cdc-4839-5399-08d7ed4d6666 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: uAfG81tQuOzOEXduECPOSJ4Ll2T+XZlsb8daVXBwVv7ejRF+0pP9/LUSvC0Z/a/s8FcXA0X9uBZsc3cZT/AUjBXsG++UCOPqwQfBExGzybEuxglCz64JXLIoCdxpqD/0BvYsE13RSk6Lkd20jQWCwbYWyX6A6mjg7EjLCnoFKEUBemWZZKm2kWan1QuebPzSOADUBRnyFk/1IdyKnun+wz8UBwpi5j4h/7nbQtIOgc6t8Wy73K5WDCspeU388ua+rcjraSdLV3C8IQ1Lf0vyN6+KLVUpguH0dyN1VbXsw5xKWvOujEpJuuROOPP/zY6rrABL2NPQ2XYbaVO60NOuAb13QkWj6cSDXiWUPEwX5qqEKN3mUOFqICyv9xLIMDmsYMksZcGSkMNEfQrOp0b5SOg36h4ay8I7acFO6Z/gzrJL1bGIuwg+nGykO7ArB899LlJcSo/LTG7SUBaKEcncpxYo4VNV8ApJiMDRNFIw3iPHEHOWtCarKIk4XutPm2wMyGE72zBLMOOZ55jqFbNDBg== 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)(966005)(478600001)(86362001)(6506007)(54906003)(71200400001)(26005)(53546011)(316002)(186003)(6636002)(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: RRP934lByb/ozU3ShAlA+/OW5dyZbEaiBIjbKCb2i6+9RlDJyu/GfvKZm5ypCx1z+Sc/FSzcPe1ExdY100KGoTOpiPJHVM+CVno4dZYvrZxCyAidlszK3LyZL3yHcK70VoXykHuZskBoMVj6OweZ4z62Wbrmegk3J2Z0xNXPpF5AxQsaTMDr0/KmsADIQrCK55rdh3C/95YCk5o6E5/h5LVtiyvTnuak2exilKrvTyko6/cZqM7lP7dJjAiqcN5Tco+9wFA3fcYaEjEpVJetey2vwAeW2liUacPHrl8fwZbIDmh8fL6IUGeShY2Hat2cQnpoLFOU84ltmJpU1n6TypErmHHYEOCrc8EWmJueDM8omBaJVMQgTIM9RGTnnNiRRlxzt+P2tGRw/rjYEb/a32X3pH+MOYO18RzvM0f6f/t74R8JpaErRq5rbl6yceYP4XIaMFpdrtI6SerFXMobtW1IzIQp6kXzrQMGJAPkfkHTIkxJZ/0FfR/mlqbq0nmVB0AWeAdElg+zP1h+v7NP9HoXB9q1ScVKFIJppxYFB6o/yDGSkbjXt0UP6M6Sbbk25TfAj9+9ePCz1g2tKPtDRVOFh8WyCWkqc4nCtzQXYUqel7Y3eH6p9xAvEL+iUYAZJtd3pYrHMMnhLQPRPsG8ePgp1VAhnyjHtfPR8+kowTU9ZnA1GfCRQsPfZ5bXqdfazPnAvAANtbHRIuwUrnsvMIMlu9ijXDqL8e2ABhO9eWserDo18jA2ESGvka6rf+fSAX3a6BJPJ/PRikQL9zaVCd45qHVuGyckLCH3eH9XYTKUBNyo547Cts1ieEHz7QVf MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 4e9687ff-6cdc-4839-5399-08d7ed4d6666 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Apr 2020 21:28:18.1611 (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: tJ/EKDTfs9L+K1l2a/szBpz1+Joc0lTvlkS8vQv33dcng4oWG2wEBYHwI9ot2gqz131zhsrzxn2Kq2DWeYJkotLZYExefrXTKs8oFJXPiEg= 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: devel@edk2.groups.io On Behalf Of Ashley E > Desimone > 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-devel] [edk2-staging/EdkRepo] [PATCH 1/7] EdkRepo: Add > check for conflicting/duplicated manifest repo definitions >=20 > Add a functions to check for conflicting or duplicated manifest reposito= ry > definitions in the edkrepo.cfg and the edkrepo_user.cfg files. Two manif= est > repositories definitions are considered conflicting if they have the sam= e > name and at least one of URL, branch or local path differ. Two manifest > repository definitions are considered duplicates if the name, URL, branc= h and > local path are the same. >=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 | 25 > ++++++++++++++++++++++ > 1 file changed, 25 insertions(+) >=20 > diff --git > a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > b/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > index 6e26d4f..ad6ddbc 100644 > --- > a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > +++ > b/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > @@ -57,3 +57,28 @@ def pull_single_manifest_repo(url, branch, local_path= , > reset_hard=3DFalse): > print (humble.CLONE_SINGLE_MAN_REPO.format(local_path, url)= ) > repo =3D Repo.clone_from(url, local_path, > progress=3DGitProgressHandler(), branch=3Dbranch) >=20 > +def detect_man_repo_conflicts_duplicates(edkrepo_cfg, > edkrepo_user_cfg): All the pre-existing EdkRepo code tends to spell out "manifest" please ren= ame this function to "detect_manifest_repo_conflicts_duplicates()" > + ''' > + Determines whether there is are conflicting or duplicated manifest > + repositories listed in the edkrepo.cfg and the edkrepo_user.cfg. > + ''' > + conflicts =3D [] > + duplicates =3D [] > + if not edkrepo_user_cfg.manifest_repo_list: > + return conflicts, duplicates > + else: > + config_repos =3D set(edkrepo_cfg.manifest_repo_list) > + user_cfg_repos =3D set(edkrepo_user_cfg.manifest_repo_list) > + if config_repos.isdisjoint(user_cfg_repos): > + return conflicts, duplicates > + else: > + for repo in config_repos.intersection(user_cfg_repos): > + if edkrepo_cfg.get_manifest_repo_url(repo) !=3D > edkrepo_user_cfg.get_manifest_repo_url(repo): > + conflicts.append(repo) > + elif edkrepo_cfg.get_manifest_repo_branch(repo) !=3D > edkrepo_user_cfg.get_manifest_repo_branch(repo): > + conflicts.append(repo) > + elif edkrepo_cfg.get_manifest_repo_local_path(repo) !=3D > edkrepo_user_cfg.get_manifest_repo_local_path(repo): > + conflicts.append(repo) > + else: > + duplicates.append(repo) > + return conflicts, duplicates > -- > 2.16.2.windows.1 >=20 >=20 >=20