From nobody Wed May 1 22:08:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59707+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59707+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1589588347; cv=none; d=zohomail.com; s=zohoarc; b=S5cOwqzAeY6BhKUCwZmM2SEZTcTUi2xtyZaeIkh+8l5MJQmy0Q2QpWpb7pofaZ0DJ4shflKgl90hEbCJ32Cvcj5rIWf4D0AESgHHAO/0PxEVHZTL476SA3ZRhyhfXHBhuysHHg9e4vQZHt+pxSwN747yC75wN4lzy1wJY2xmo40= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589588347; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=UaiQwZYsq/mBQ9CVbSW5Qa+1EM7iwu+8kDbQwZ3E9qM=; b=TdGXEPeQnbhaKa67apPm+3YOm3xuxs7Kn8qKxnlFEQtWgTisF4thY4rs0jckUUXGOm+GnJBwLL6LFTw0GoU2y5DAqcHw2GyPwiW1dzwRAmM/M/HpscZMWrppMIvZqyo+yVz6SHwiSSy+5zfGJFADb55g2K6opYWlrY3/nMq3+MM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59707+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589588347767785.0884503898328; Fri, 15 May 2020 17:19:07 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id E0byYY1788612xBtwdLRR9UM; Fri, 15 May 2020 17:19:07 -0700 X-Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web10.3779.1589588346234858406 for ; Fri, 15 May 2020 17:19:06 -0700 IronPort-SDR: D3f6zlhfu1JG4Oc33JjhJ/lM5aV/GqzaXHlLBGn6x6H4BvhR1C/XA7YEtAVQBZTuHW5qeBnliE VBbKbTXdBB7w== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2020 17:19:05 -0700 IronPort-SDR: GXTAp/tk3W2Thvh0UGbODtEcyqWA4Nhr4/B1lqAV/s8ycEMMl3a8fIFI57dKULsHWPxzxD47iK 71xDvE3LybRA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,397,1583222400"; d="scan'208";a="263354958" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.212.18.166]) by orsmga003.jf.intel.com with ESMTP; 15 May 2020 17:19:04 -0700 From: "Ashley E Desimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Pass a ManifestXML to find_project_in_all_indices Date: Fri, 15 May 2020 17:19:01 -0700 Message-Id: <20200516001901.13008-1-ashley.e.desimone@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashley.e.desimone@intel.com X-Gm-Message-State: hqP47oMrDfeTDRFAyJy0TBFrx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589588347; bh=hvsq+Kha5BEUGHYJxetPnNDbrOc7+IDeco71Z+B10Uk=; h=Cc:Date:From:Reply-To:Subject:To; b=pgo7i+nBjZt79K/5vaG0JPC57JdrGeq1b915lVJTCmu70Zc4hG/d2sJ9Pi0UQVlAaM9 9FtBHDLJNfkhSFipuiHts/bIufGN3UrMxKFUGwR5Lti0sthU/0iRmuJeeXYp7V0VB6nsc J1+Zs5Ju0MG8LUwJld/quJQ6Kb7iKPFNfmo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When attempting to resolve whether a manifest is a loose manifest or cannot be found pass a ManifestXML object to the recurisve call toe find_project_in_all_indices Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Erik Bjorge Reviewed-by: Nate DeSimone --- edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc= e.py b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py index 08c4fe6..db41e75 100644 --- a/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py +++ b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py @@ -197,7 +197,7 @@ def find_project_in_all_indices (project, edkrepo_cfg, = edkrepo_user_cfg, except_ except EdkrepoManifestNotFoundException: return None, None, project elif os.path.isfile(os.path.join(os.getcwd(), project)): - manifest =3D os.path.join(os.getcwd(), project) + manifest =3D ManifestXml(os.path.join(os.getcwd(), project)) try: found_manifest_repo, found_cfg, found_project =3D find_project= _in_all_indices(manifest.project_info.codename, = edkrepo_cfg, --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#59707): https://edk2.groups.io/g/devel/message/59707 Mute This Topic: https://groups.io/mt/74240221/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-