From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: D3f6zlhfu1JG4Oc33JjhJ/lM5aV/GqzaXHlLBGn6x6H4BvhR1C/XA7YEtAVQBZTuHW5qeBnliE VBbKbTXdBB7w== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False 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" 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-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> X-Mailer: git-send-email 2.16.2.windows.1 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 --- 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_maintenance.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 = os.path.join(os.getcwd(), project) + manifest = ManifestXml(os.path.join(os.getcwd(), project)) try: found_manifest_repo, found_cfg, found_project = find_project_in_all_indices(manifest.project_info.codename, edkrepo_cfg, -- 2.16.2.windows.1