From nobody Thu Apr 25 23:28:45 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+65204+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+65204+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1599933172; cv=none; d=zohomail.com; s=zohoarc; b=mKz3hRaqJ9hLzfrOBFXQv1Da3265sOkbBc/YAmXakcnlgPrYreWIoHP1FkgKeuF97WXTt9G7pPEAiev/kzDDxaIRv4oE/Hme06dYpEsmX3MIWZOerBC6/28tAb8CDIUJIsza05FjTroCyN6s46AQyPSAIh9qwvTmuVaYStibfJc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599933172; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=I7LIzdVUsZIXWBXFaT72GVOYOZjE+Nk7IQDn3BR9hb8=; b=KuDw4JPDReud2tdYN7Bc3Vjpj0FFFFo1o/DSVRpfcBLDOXBuBy1xNkp4xEGnbFJht7dSGTlXJGyghBr+ua+y9fxLl/B99uiEWshQd0dcS9rtvHp17lNukb9E64oept64h0WF4u8hXzW363x8I4dCHzGN3pTXdsn1s/PX0e7Cpwk= 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+65204+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 1599933172463128.27355148215577; Sat, 12 Sep 2020 10:52:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id k5bYYY1788612xv2E40jLy3I; Sat, 12 Sep 2020 10:52:52 -0700 X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web12.22422.1599933170982604171 for ; Sat, 12 Sep 2020 10:52:51 -0700 IronPort-SDR: SB763xsV5BLr/zpbhyPxVTLKausJW2GC++YYH1xY38FK0usJ+e96vXKdOPBMCdGvkhNuEREbuV cWRdp0Ryruug== X-IronPort-AV: E=McAfee;i="6000,8403,9742"; a="138439393" X-IronPort-AV: E=Sophos;i="5.76,420,1592895600"; d="scan'208";a="138439393" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2020 10:52:48 -0700 IronPort-SDR: G92hf1mYdSx6z5TbKMBFVbAuw8rQY4vch6jFHSHZs2lQ+l3r6YGGHO12PJhmGIe/AIDpUCfMka Td9fOE350GHg== X-IronPort-AV: E=Sophos;i="5.76,420,1592895600"; d="scan'208";a="344950534" X-Received: from ohaun-mobl1.amr.corp.intel.com (HELO nldesimo-DESK1.amr.corp.intel.com) ([10.212.70.117]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2020 10:52:48 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Ashley E Desimone , Puja Pandya , Bret Barkelew , Prince Agyeman , Erik Bjorge Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH V1] EdkRepo: edkrepo clone fails when given an archived project name Date: Sat, 12 Sep 2020 10:52:36 -0700 Message-Id: <20200912175236.2086-1-nathaniel.l.desimone@intel.com> MIME-Version: 1.0 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,nathaniel.l.desimone@intel.com X-Gm-Message-State: Bo2mx7GvFdFdW2cj1IeMSVzTx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1599933172; bh=O4CfC45lCS2SFzbN6gYr2xmfSKlHpRwUU5iTnoKbiWM=; h=Cc:Date:From:Reply-To:Subject:To; b=r1Yk4TlYML8Y+DhKzu/c8+6viDMRTwYgsVvqH8OM/IQPl2oDL6EPxe1HFW0zKSLvB0N leD1RRgkM0SHDkyubODHWsZn8DkBx9n8OyyQqwHevUxXXZbNzDNkc5jNxSfHeXkxrGNww roccuJc4iCWHkB1S7osG05YT64DufjFdEjc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 1. find_project_in_single_index() needs to search archived projects if the project name was not found in the active projects list 2. In a rare corner case, find_project_in_all_indices() can return to the caller without providing any return arguments. Now an exception will be raised. Cc: Ashley E Desimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge Signed-off-by: Nate DeSimone Reviewed-by: Ashley DeSimone --- .../workspace_maintenance/manifest_repos_maintenance.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc= e.py b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py index db41e75..a57815d 100644 --- a/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py +++ b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py @@ -148,6 +148,11 @@ def find_project_in_single_index (project, index_file,= manifest_dir): proj_name =3D case_insensitive_single_match(project, index_file.pr= oject_list) except: proj_name =3D None + if proj_name is None: + try: + proj_name =3D case_insensitive_single_match(project, index_fil= e.archived_project_list) + except: + proj_name =3D None if proj_name: ci_index_xml_rel_path =3D os.path.normpath(index_file.get_project_= xml(proj_name)) global_manifest_path =3D os.path.join(manifest_dir, ci_index_xml_r= el_path) @@ -219,6 +224,7 @@ def find_project_in_all_indices (project, edkrepo_cfg, = edkrepo_user_cfg, except_ for dirpath, dirname, filenames in os.walk(edkrepo_user_cf= g.manifest_repo_abs_path(repo)): if project in filenames: return repo, 'edkrepo_user_cfg', os.path.join(dirp= ath, project) + raise EdkrepoManifestNotFoundException(humble.PROJ_NOT_IN_REPO.for= mat(project)) else: raise EdkrepoManifestNotFoundException(humble.PROJ_NOT_IN_REPO.for= mat(project)) =20 --=20 2.27.0.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 (#65204): https://edk2.groups.io/g/devel/message/65204 Mute This Topic: https://groups.io/mt/76805366/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-