From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.1003.1588282137998463868 for ; Thu, 30 Apr 2020 14:28:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=sbvuKHjQ; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: BP3/s7opLwtJlPfDRJF3fxN+ZBVWgmw30kPItHD2WPYE/n9p57fXuFAJFp65MhygREjoOoqtNJ ivsXmIXuY2Pw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2020 14:28:56 -0700 IronPort-SDR: IEIc+VrS5ysihepBRJu4vWEBp/DcB2jxR9pvSPwGG2u6zBwP+/ACfAU6Ozm3AQeREYcYCIg3Yw mBpYJzSNMDeg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,337,1583222400"; d="scan'208";a="276650999" Received: from orsmsx103.amr.corp.intel.com ([10.22.225.130]) by orsmga002.jf.intel.com with ESMTP; 30 Apr 2020 14:28:56 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX103.amr.corp.intel.com (10.22.225.130) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 30 Apr 2020 14:28:56 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 30 Apr 2020 14:28:55 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Thu, 30 Apr 2020 14:28:55 -0700 Received: from NAM04-BN3-obe.outbound.protection.outlook.com (104.47.46.50) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 30 Apr 2020 14:28:55 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U72U+rSL80le7FuNFxcNz/aIMELMCbMFYsLBhalxHFd8aHNYY9ujLFexzVUj8FLB5U3zUCB9YmKU/BGRuXpVEbgoEheXjGPBSsJp9aK0sZWz+2+5+dnqrtfGq9Ly8y00+YFsr7mT+/L9+oOLPrYPwn0hhi/gHgGZ7ksnnc87ndb9ip2LgnuokeIYnDAzYsexTSEGkXv6++rH+Bsw+T+nQ/WfRmSdHQcwJ3d1Fxz9LQdWgzcQ19zvfsRlfP5gXhuXWeR7IIJXXR9MLyeNo2wsJK9wnSvvDFqs+jjKVBRCwzJH7u+t6TBoMFnvtJEglcBKz8wwxcezNqa3PvRhlUQsTw== 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=nUaxwqjdvjgjQemjclfsVniDqXbGlhG3tTgZEeA8BUA=; b=iVImxtnyP6siJWxNjzoZ5dgLRXn5s/QK06B8DAcSmiDJPPVK9MHe5Bb6vPQi91Av5zxrBGXIcJ1DciifEXRtUeyTZCh2aUPoO1P5LYoTEwMp7RPN2M346XfORg61HhNzuVAQfWTz8COQsJX1RB3fKcl+yg7xvXd+YJyQ0Kghn5g+D1JvaEqWfQa/TCQ2emPmeeRbDUrmLnBRQ/FLA9fEAkQZNodO9lOIEq1q8sSh/uQlMslNO0B3M8Ozrw4Fo9zKM10x20JU0GT5hsKL8aKkVj3u/8N8C//HlMGomymKditpcIJ6dtom1Qb5c3QUVfUuZnndL9dbCPpBgbT0KjaYyg== 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=nUaxwqjdvjgjQemjclfsVniDqXbGlhG3tTgZEeA8BUA=; b=sbvuKHjQU79/5HyVndiNhZzI/GtafaHmD+KR+PTpjf0gv3oXZMNyV0qFuJcL/aAcTOpwRcRm/YxwxTKSyt4eTDUAEK/I0oJKfYwcJUsXXyTrpR1kRtjueNqPIdIskOIFzNpIvQ8xFsIEV5/PlsDjlDuifq2YHHLHGpoeyqYwV0o= 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:54 +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:54 +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 6/7] EdkRepo: Add ability to determine the source manifest of a workspace Thread-Topic: [edk2-staging/EdkRepo] [PATCH 6/7] EdkRepo: Add ability to determine the source manifest of a workspace Thread-Index: AQHWHagQQyPHC7Lav0iwmCZqnxRGvaiSKrZg Date: Thu, 30 Apr 2020 21:28:54 +0000 Message-ID: References: <20200428215710.45504-1-ashley.e.desimone@intel.com> <20200428215710.45504-7-ashley.e.desimone@intel.com> In-Reply-To: <20200428215710.45504-7-ashley.e.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZmZhZDA4MWMtNGZjMS00MzA1LWFmZjEtODVlZjQ5MTkyNjNiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiNXgxazl0eEtUc2ZrZ29sTmNaTm1RVHBLN0RRYVE5TjZ0YVdRTmtmaHdqVXNpbEtEdTVZU2hORks3QXlVeHI5UCJ9 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: 4221f055-c707-4e5d-b6d4-08d7ed4d7c14 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: i4tOmowQAZeqiQlICBLDcfsI1tqU8gaBeF5iDeSkoVx2TrAiTgzxrUNzHWxzzc/FrnfJtR5b4684eQkGfN46e8kK8KcteD/uoRlbpJjh+m7VZjc4FGkfTYm6AQ4xqIrqi5q8YuSpXW0J1i5gChvgH8M3cA20s0cWgrSnyso8TMpnwXXcFS3Mp3M74R07sE8mdSdA7F+w5P7fIHvpgJ8J7LohPg3Yr9TJ9OhfZOGhbg4+bK8zFSxukKh1sVRmQRE4dljplZ5QyNVm9wfca7EB+GeLK95Tv0rRwEX1iptisqTwPuniFrjcAnNcHkXTcDMDa82d8UFdrrAIC0cQfKyg1ngaj0DiIALZCFcfmPZw7IRt9tDsxU8x33viS5g21k0jmKPqLz847MpgysyWsAYTn2vHkb2O7rkqR2NJhM9qtj8Gszta3nRUAVtlqgwCoYZE 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: Hks5qszeGd40qUPAbGq3irPf4+WQTXV561XLxBHSTkr9AKm6TvmNxJBh3l5wAxfbbd/CsNO6bxPZ/vIi90ib2T4p/ALseMWiN+nwoZ/LV04G6abGut6hx9RLlsZTADfKdZ7jb1GYAfevbDcILRc3kIt7NcRO5XIsKuN2KNUNcu7Ud+FA7SSina91Rs+LiTkrHXphIY7IRPjBb1IRgN5+i3+KaoneoMwcFWUOk++QImY3OYoCjgQcdHZ/O7tCnWbSnlf4Bdi9K7sGTFPOf8yNjWrXY9pkTy1C1yz2z5AMrckFUvOqz0GbrRVB2+619O11MoCf0IfTzJVayktQY67b5kf6GGXWU0NxallA+CRnvleBhBRxnoVdVQYC8yYyQ8E7f+ZvhibOikmZIxvJCMKqJSmmKv2rQm71HIessLlfAFUW0sN8CfmypSue9KLqZ/kp1vK2ooAW3aU3cclQoZUhAvQrOEOd4SrU81W1zR8Q7V7Kp1mKeh8eQcBIgdj7BFCBIHC+nfmvzzTmMpcTIbVnXzf6GczYK/9qgZ2jhEDUWr2Cge4njRoTtlcGNbiY9W2q5dlrrrD8DeZ2U5Btedu4dJlQzuI+NeP9kTXatdy0JFCI2bO9rEGEzwkWXK68LZl1XRU2pbodLCUiOM/iogemv8MzlINUSB7wttiX+Z68AdrCwZNThpvbHHKYzksiGpKJFRqJfgZobLr/wXiGjxc0MqGgjWJHULTCz3Q/0zMRZB+LPBf4cUDkQBtVm4cHcD3i9nREOIgfC4uYLKtnSL170MFwVD4BD3NQoGglSdVIJsmh/WYfGM6RsDfZi0O/8JLu MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 4221f055-c707-4e5d-b6d4-08d7ed4d7c14 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Apr 2020 21:28:54.5421 (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: vFyEO/NOyi919UnGxmby/IVAbf7bngasiPet6cfxKxWrbvBGhYRIQrRPk4YKFOBvkUH75uifHECcRGW7pYPeqyFKDASCrG/KqdaSHuKid+w= 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 6/7] EdkRepo: Add ability to > determine the source manifest of a workspace >=20 > Add find_source_man_repo() to check if for the source manifest repo is > contained in the workspaces project manifest file. > If it is not determine the value and write it to the manifest. >=20 > Signed-off-by: Ashley E Desimone > Cc: Nate DeSimone > Cc: Puja Pandya > Cc: Erik Bjorge > Cc: Bret Barkelew > Cc: Prince Agyeman > --- > .../humble/manifest_repos_maintenance_humble.py | 2 ++ > .../workspace_maintenance/manifest_repos_maintenance.py | 15 > +++++++++++++++ > 2 files changed, 17 insertions(+) >=20 > diff --git > a/edkrepo/common/workspace_maintenance/humble/manifest_repos_ma > intenance_humble.py > b/edkrepo/common/workspace_maintenance/humble/manifest_repos_ma > intenance_humble.py > index e592f19..05e76b1 100644 > --- > a/edkrepo/common/workspace_maintenance/humble/manifest_repos_ma > intenance_humble.py > +++ > b/edkrepo/common/workspace_maintenance/humble/manifest_repos_ma > inten > +++ ance_humble.py > @@ -25,3 +25,5 @@ CONFLICT_NO_CLONE =3D ('The definition of global > manifest repository, {}, ' > 'in the edkrepo_user.cfg does not match the definit= ion in the > edkrepo.cfg. ' > 'This global manifest repository will not be downlo= aded or > updated. ' > 'Resolve the conflict and then re-run the failed op= eration') > +SOURCE_MAN_REPO_NOT_FOUND =3D 'Could not determine the source > global manifest repository for project: {}' > +PROJ_NOT_IN_REPO =3D 'Project: {} does not exist in any global manifest > repository' > \ No newline at end of file > diff --git > a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > b/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > index 9b441ac..7b3f866 100644 > --- > a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > +++ > b/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > @@ -199,5 +199,20 @@ def find_project_in_all_indices (project, > edkrepo_cfg, edkrepo_user_cfg, except_ > return repo, 'edkrepo_user_cfg', os.path.join(di= rpath, project) >=20 >=20 > +def find_source_man_repo (project_manifest, edkrepo_cfg, > edkrepo_user_cfg): All the pre-existing EdkRepo code tends to spell out "manifest" please rena= me this function to "find_source_manifest_repo()" > + ''' > + Finds the source manifest repo for a given project. > + ''' > + if project_manifest.general_config.source_man_repo: > + return project_manifest.general_config.source_man_repo > + else: > + src_man_repo, src_config, src_man_path =3D > find_project_in_all_indices(project_manifest.project_info.codename, > + = edkrepo_cfg, > + = edkrepo_user_cfg, > + > humble.PROJ_NOT_IN_REPO.format(project_manifest.project_info.codena > me), > + > humble.SOURCE_MAN_REPO_NOT_FOUND.format(project_manifest.proje > ct_info.codename), > + = man_repo=3DNone) > + project_manifest.write_source_manifest_repo(src_man_repo) > + return src_man_repo >=20 >=20 > -- > 2.16.2.windows.1